diff --git a/Material.Avalonia.Dialogs/DialogHelper.cs b/Material.Avalonia.Dialogs/DialogHelper.cs
index 09b412f2..811a77dc 100644
--- a/Material.Avalonia.Dialogs/DialogHelper.cs
+++ b/Material.Avalonia.Dialogs/DialogHelper.cs
@@ -245,7 +245,7 @@ private static void ApplyBaseParams<T>(T input, DialogWindowBuilderParamsBase @p
                     throw new ArgumentException("Do not wrap Bitmap object with Image control for now.");
 
                 case Control _:
-                    throw new ArgumentException("Custom view icon feature is currently unavailable.");
+                    throw new NotImplementedException("Custom view icon feature is currently unavailable.");
 
                 case DialogIconKind kind:
                 {
diff --git a/Material.Avalonia.Dialogs/Material.Avalonia.Dialogs.csproj b/Material.Avalonia.Dialogs/Material.Avalonia.Dialogs.csproj
index 72f4285e..c2d29f0b 100644
--- a/Material.Avalonia.Dialogs/Material.Avalonia.Dialogs.csproj
+++ b/Material.Avalonia.Dialogs/Material.Avalonia.Dialogs.csproj
@@ -6,6 +6,8 @@
     <PackageIcon>FavIcon.png</PackageIcon>
 
     <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
+
+    <RootNamespace>Material.Dialog</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Material.Avalonia.Dialogs/Resources/Naming/PartNames.cs b/Material.Avalonia.Dialogs/Resources/Naming/PartNames.cs
deleted file mode 100644
index 2cfa22e5..00000000
--- a/Material.Avalonia.Dialogs/Resources/Naming/PartNames.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace Material.Dialog.Resources.Naming
-{
-    public static class PartNames
-    {
-        public static string PartRootBorder => "PART_RootBorder";
-
-        public static string PartRootPanel => "PART_RootPanel";
-
-        public static string PartScrollViewer => "PART_ScrollViewer";
-
-        public static string PartContentPanel => "PART_ContentPanel";
-
-        public static string PartSupportingText => "PART_SupportingText";
-
-        public static string PartContentPresenter => "PART_ContentPresenter";
-
-        public static string PartTextFieldsContainer => "PART_TextFields";
-
-
-        public static string PartHeaderPanel => "PART_HeaderPanel";
-
-        public static string PartHeaderIcon => "PART_HeaderIcon";
-
-        public static string PartHeaderText => "PART_HeaderText";
-
-        public static string PartButtonsPanel => "PART_ButtonsPanel";
-
-
-        public static string PartButtonPlacement => "PART_ButtonPlacement";
-
-        public static string PartNeutralButtonPlacement => "PART_NeutralButtonPlacement";
-    }
-}
\ No newline at end of file
diff --git a/Material.Avalonia.Dialogs/Styles/EmbeddedDialogControl.axaml b/Material.Avalonia.Dialogs/Styles/EmbeddedDialogControl.axaml
index c1a6f533..b3783f97 100644
--- a/Material.Avalonia.Dialogs/Styles/EmbeddedDialogControl.axaml
+++ b/Material.Avalonia.Dialogs/Styles/EmbeddedDialogControl.axaml
@@ -1,125 +1,126 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:viewModels="clr-namespace:Material.Dialog.ViewModels" 
+        xmlns:viewModels="clr-namespace:Material.Dialog.ViewModels"
         xmlns:controls="clr-namespace:Material.Dialog.Controls"
         xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
-        xmlns:naming="clr-namespace:Material.Dialog.Resources.Naming">
-    <Styles.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://Material.Avalonia.Dialogs/Resources/TemplateResources.axaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Styles.Resources>
-
-    <Style Selector="controls|EmbeddedDialogControl" x:DataType="viewModels:DialogWindowViewModel" >
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border Name="PART_RootBorder"
-                        Background="{DynamicResource MaterialCardBackgroundBrush}" >
-                    <DockPanel Name="PART_RootPanel"
-                               Width="{Binding Width}"
-                               MaxWidth="{Binding MaxWidth}" >
-                        <DockPanel Name="{x:Static naming:PartNames.PartHeaderPanel}">
-                            <ContentPresenter Name="{x:Static naming:PartNames.PartHeaderIcon}"
-                                              Content="{Binding DialogIcon}"
-                                              ContentTemplate="{StaticResource DialogHeaderIconTemplate}"
-                                              IsVisible="{Binding !!DialogIcon}" />
-                            <DockPanel.IsVisible>
-                                <MultiBinding Converter="{x:Static BoolConverters.Or}">
-                                    <CompiledBinding Converter="{x:Static ObjectConverters.IsNotNull}" Path="DialogIcon" />
-                                    <CompiledBinding Converter="{x:Static StringConverters.IsNotNullOrEmpty}" Path="ContentHeader" />
-                                </MultiBinding>
-                            </DockPanel.IsVisible>
-                            <TextBlock Name="{x:Static naming:PartNames.PartHeaderText}"
-                                       Classes="Headline6"
-                                       IsVisible="{Binding !!ContentHeader.Length}"
-                                       Text="{Binding ContentHeader, FallbackValue='DIALOG_HEADER_NULL'}" />
-                        </DockPanel>
-
-                        <DockPanel Name="{x:Static naming:PartNames.PartButtonsPanel}">
-                            
-                            <ItemsControl Name="{x:Static naming:PartNames.PartNeutralButtonPlacement}"
-                                          DockPanel.Dock="Left"
-                                          ItemsSource="{Binding NeutralDialogButton}"
-                                          ItemTemplate="{StaticResource DialogButtonTemplate}"
-                                          ItemsPanel="{StaticResource DialogButtonPlacementPanel}" />
-
-                            <ItemsControl Name="{x:Static naming:PartNames.PartButtonPlacement}"
-                                          DockPanel.Dock="Right"
-                                          ItemsSource="{Binding DialogButtons}"
-                                          ItemTemplate="{StaticResource DialogButtonTemplate}"
-                                          ItemsPanel="{StaticResource DialogButtonPlacementPanel}" />
-                        </DockPanel>
-
-                        <ContentPresenter Name="PART_ContentPresenter"
-                                          DockPanel.Dock="Left"
-                                          Content="{TemplateBinding Content}"
-                                          ContentTemplate="{TemplateBinding ContentTemplate}" />
-                    </DockPanel>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-    
-    <Style Selector="controls|EmbeddedDialogControl /template/ Border#PART_RootBorder">
-        <Setter Property="assists:ShadowAssist.ShadowDepth" Value="CenterDepth3"/>
-        <Setter Property="CornerRadius" Value="4"/>
-        <Setter Property="Margin" Value="32"/>
-    </Style>
-    
-    <Style Selector="controls|EmbeddedDialogControl /template/ DockPanel#PART_HeaderPanel">
-        <Setter Property="Margin" Value="24,24,24,14"/>
-        <Setter Property="Dock" Value="Top"/>
-    </Style>
-    
-    <Style Selector="controls|EmbeddedDialogControl /template/ ContentPresenter#PART_HeaderIcon">
-        <Setter Property="Width" Value="32"/>
-        <Setter Property="Height" Value="32"/>
-        <Setter Property="Margin" Value="0,0,8,0"/>
-    </Style>
-    
-    <Style Selector="controls|EmbeddedDialogControl /template/ TextBlock#PART_HeaderText">
-        <Setter Property="VerticalAlignment" Value="Center"/>
-    </Style>
-    
-    <Style Selector="controls|EmbeddedDialogControl /template/ DockPanel#PART_ButtonsPanel">
-        <Setter Property="Margin" Value="4,16,4,4"/>
-        <Setter Property="Dock" Value="Bottom"/>
-    </Style>
-    
-    <Style Selector="controls|EmbeddedDialogControl /template/ ItemsControl#PART_ButtonPlacement">
-        <Setter Property="HorizontalAlignment" Value="Right"/>
-    </Style>
-    
-    <Style Selector="controls|EmbeddedDialogControl /template/ ItemsControl#PART_ButtonPlacement Button,
+        xmlns:system="clr-namespace:System;assembly=netstandard">
+  <Styles.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Material.Avalonia.Dialogs/Resources/TemplateResources.axaml" />
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </Styles.Resources>
+
+  <Style Selector="controls|EmbeddedDialogControl"
+         x:DataType="viewModels:DialogWindowViewModel">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="PART_RootBorder"
+                Background="{DynamicResource MaterialCardBackgroundBrush}">
+          <DockPanel Name="PART_RootPanel"
+                     Width="{Binding Width, TargetNullValue={x:Static system:Double.NaN}}"
+                     MaxWidth="{Binding MaxWidth, TargetNullValue={x:Static system:Double.PositiveInfinity}}">
+            <DockPanel Name="PART_HeaderPanel">
+              <ContentControl Name="PART_HeaderIcon"
+                              Content="{Binding DialogIcon}"
+                              ContentTemplate="{StaticResource DialogHeaderIconTemplate}"
+                              IsVisible="{Binding DialogIcon, Converter={x:Static ObjectConverters.IsNotNull}}" />
+              <DockPanel.IsVisible>
+                <MultiBinding Converter="{x:Static BoolConverters.Or}">
+                  <CompiledBinding Converter="{x:Static ObjectConverters.IsNotNull}" Path="DialogIcon" />
+                  <CompiledBinding Converter="{x:Static StringConverters.IsNotNullOrEmpty}" Path="ContentHeader" />
+                </MultiBinding>
+              </DockPanel.IsVisible>
+              <TextBlock Name="PART_HeaderText"
+                         Classes="Headline6"
+                         IsVisible="{Binding ContentHeader, Converter={x:Static ObjectConverters.IsNotNull}}"
+                         Text="{Binding ContentHeader, FallbackValue='DIALOG_HEADER_NULL'}" />
+            </DockPanel>
+
+            <DockPanel Name="PART_ButtonsPanel">
+
+              <ItemsControl Name="PART_NeutralButtonPlacement"
+                            DockPanel.Dock="Left"
+                            ItemsSource="{Binding NeutralDialogButton}"
+                            ItemTemplate="{StaticResource DialogButtonTemplate}"
+                            ItemsPanel="{StaticResource DialogButtonPlacementPanel}" />
+
+              <ItemsControl Name="PART_ButtonPlacement"
+                            DockPanel.Dock="Right"
+                            ItemsSource="{Binding DialogButtons}"
+                            ItemTemplate="{StaticResource DialogButtonTemplate}"
+                            ItemsPanel="{StaticResource DialogButtonPlacementPanel}" />
+            </DockPanel>
+
+            <ContentControl Name="PART_ContentHolder"
+                              DockPanel.Dock="Left"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}" />
+          </DockPanel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="controls|EmbeddedDialogControl /template/ Border#PART_RootBorder">
+    <Setter Property="assists:ShadowAssist.ShadowDepth" Value="CenterDepth3" />
+    <Setter Property="CornerRadius" Value="4" />
+    <Setter Property="Margin" Value="32" />
+  </Style>
+
+  <Style Selector="controls|EmbeddedDialogControl /template/ DockPanel#PART_HeaderPanel">
+    <Setter Property="Margin" Value="24,24,24,14" />
+    <Setter Property="Dock" Value="Top" />
+  </Style>
+
+  <Style Selector="controls|EmbeddedDialogControl /template/ ContentControl#PART_HeaderIcon">
+    <Setter Property="Width" Value="32" />
+    <Setter Property="Height" Value="32" />
+    <Setter Property="Margin" Value="0,0,8,0" />
+  </Style>
+
+  <Style Selector="controls|EmbeddedDialogControl /template/ TextBlock#PART_HeaderText">
+    <Setter Property="VerticalAlignment" Value="Center" />
+  </Style>
+
+  <Style Selector="controls|EmbeddedDialogControl /template/ DockPanel#PART_ButtonsPanel">
+    <Setter Property="Margin" Value="4,16,4,4" />
+    <Setter Property="Dock" Value="Bottom" />
+  </Style>
+
+  <Style Selector="controls|EmbeddedDialogControl /template/ ItemsControl#PART_ButtonPlacement">
+    <Setter Property="HorizontalAlignment" Value="Right" />
+  </Style>
+
+  <Style Selector="controls|EmbeddedDialogControl /template/ ItemsControl#PART_ButtonPlacement Button,
                      controls|EmbeddedDialogControl /template/ ItemsControl#PART_NeutralButtonPlacement Button">
-        <Setter Property="Margin" Value="4"/>
-    </Style>
-    
-    <Style Selector="controls|EmbeddedDialogControl /template/ ItemsControl#PART_NeutralButtonPlacement ItemsPresenter">
-        <Setter Property="(KeyboardNavigation.TabNavigation)" Value="Continue" />
-    </Style>
-    
-    <Style Selector="controls|EmbeddedDialogControl /template/ ItemsControl#PART_ButtonPlacement ItemsPresenter">
-        <Setter Property="(KeyboardNavigation.TabNavigation)" Value="Continue" />
-    </Style>
-    
-    
-    <Style Selector="controls|EmbeddedDialogControl > ScrollViewer#PART_ScrollViewer > StackPanel#PART_ContentPanel > TextBlock#PART_SupportingText">
-        <Setter Property="Margin" Value="24,0"/>
-        <Setter Property="TextWrapping" Value="Wrap"/>
-    </Style>
-    
-    <!-- For TextField dialog -->
-    <Style Selector="controls|EmbeddedDialogControl > ScrollViewer#PART_ScrollViewer > StackPanel#PART_ContentPanel > ItemsControl#PART_TextFields">
-        <Setter Property="Margin" Value="24,4"/>
-        <Setter Property="HorizontalAlignment" Value="Stretch"/>
-    </Style>
-    
-    <!-- Origin contribution by dojo90
+    <Setter Property="Margin" Value="4" />
+  </Style>
+
+  <Style Selector="controls|EmbeddedDialogControl /template/ ItemsControl#PART_NeutralButtonPlacement ItemsPresenter">
+    <Setter Property="(KeyboardNavigation.TabNavigation)" Value="Continue" />
+  </Style>
+
+  <Style Selector="controls|EmbeddedDialogControl /template/ ItemsControl#PART_ButtonPlacement ItemsPresenter">
+    <Setter Property="(KeyboardNavigation.TabNavigation)" Value="Continue" />
+  </Style>
+
+
+  <Style Selector="controls|EmbeddedDialogControl > ScrollViewer#PART_ScrollViewer > StackPanel#PART_ContentPanel > TextBlock#PART_SupportingText">
+    <Setter Property="Margin" Value="24,0" />
+    <Setter Property="TextWrapping" Value="Wrap" />
+  </Style>
+
+  <!-- For TextField dialog -->
+  <Style Selector="controls|EmbeddedDialogControl > ScrollViewer#PART_ScrollViewer > StackPanel#PART_ContentPanel > ItemsControl#PART_TextFields">
+    <Setter Property="Margin" Value="24,4" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+  </Style>
+
+  <!-- Origin contribution by dojo90
          https://github.com/AvaloniaCommunity/Material.Avalonia/pull/147 -->
-    <Style Selector="controls|EmbeddedDialogControl > ScrollViewer#PART_ScrollViewer > StackPanel#PART_ContentPanel > ItemsControl#PART_TextFields ItemsPresenter">
-        <Setter Property="(KeyboardNavigation.TabNavigation)" Value="Continue" />
-    </Style>
-</Styles>
+  <Style Selector="controls|EmbeddedDialogControl > ScrollViewer#PART_ScrollViewer > StackPanel#PART_ContentPanel > ItemsControl#PART_TextFields ItemsPresenter">
+    <Setter Property="(KeyboardNavigation.TabNavigation)" Value="Continue" />
+  </Style>
+</Styles>
\ No newline at end of file
diff --git a/Material.Avalonia.Dialogs/Views/AlertDialog.axaml b/Material.Avalonia.Dialogs/Views/AlertDialog.axaml
index be99de9b..919ddc75 100644
--- a/Material.Avalonia.Dialogs/Views/AlertDialog.axaml
+++ b/Material.Avalonia.Dialogs/Views/AlertDialog.axaml
@@ -11,8 +11,9 @@
     </Window.Styles>
     
     <controls:EmbeddedDialogControl>
-        <ScrollViewer Name="PART_ScrollView" Padding="24, 0">
-            <StackPanel Name="PART_ContentPanel">
+        <ScrollViewer Name="PART_ScrollView">
+            <StackPanel Name="PART_ContentPanel"
+                        Margin="24, 0">
                 <TextBlock Name="PART_SupportingText"
                            Classes="Body1"
                            IsVisible="{Binding !!ContentMessage.Length}"
diff --git a/Material.Avalonia.Dialogs/Views/CustomDialog.axaml b/Material.Avalonia.Dialogs/Views/CustomDialog.axaml
index 4da71db6..dba9b849 100644
--- a/Material.Avalonia.Dialogs/Views/CustomDialog.axaml
+++ b/Material.Avalonia.Dialogs/Views/CustomDialog.axaml
@@ -16,7 +16,7 @@
             <StackPanel Name="PART_ContentPanel">
                 <TextBlock Name="PART_SupportingText"
                            Classes="Body1"
-                           IsVisible="{Binding !!ContentMessage.Length}"
+                           IsVisible="{Binding ContentMessage, Converter={x:Static ObjectConverters.IsNotNull}}"
                            Text="{Binding ContentMessage, FallbackValue='DIALOG_SUPPORTING_TEXT'}"/>
             
                 <ContentPresenter Name="PART_ContentPresenter"
diff --git a/Material.Avalonia.Dialogs/Views/TextFieldDialog.axaml b/Material.Avalonia.Dialogs/Views/TextFieldDialog.axaml
index 6653a55c..1fe57887 100644
--- a/Material.Avalonia.Dialogs/Views/TextFieldDialog.axaml
+++ b/Material.Avalonia.Dialogs/Views/TextFieldDialog.axaml
@@ -14,11 +14,12 @@
     </Window.Styles>
     
     <controls:EmbeddedDialogControl>
-        <ScrollViewer Name="PART_ScrollView" Padding="24, 0">
-            <StackPanel Name="PART_ContentPanel">
+        <ScrollViewer Name="PART_ScrollView" >
+            <StackPanel Name="PART_ContentPanel"
+                        Margin="24, 0">
                 <TextBlock Name="PART_SupportingText"
                            Classes="Body1"
-                           IsVisible="{Binding !!ContentMessage.Length}"
+                           IsVisible="{Binding ContentMessage, Converter={x:Static ObjectConverters.IsNotNull}}"
                            Text="{Binding ContentMessage, FallbackValue='DIALOG_SUPPORTING_TEXT'}" />
 
                 <ItemsControl Name="PART_Fields"