diff --git a/src/dosymep.WpfUI.Core/SimpleServices/WpfUIMessageBoxService.cs b/src/dosymep.WpfUI.Core/SimpleServices/WpfUIMessageBoxService.cs
index 6ae9df8..bf7f3f2 100644
--- a/src/dosymep.WpfUI.Core/SimpleServices/WpfUIMessageBoxService.cs
+++ b/src/dosymep.WpfUI.Core/SimpleServices/WpfUIMessageBoxService.cs
@@ -60,11 +60,11 @@ public MessageBoxResult Show(string messageBoxText,
         void UpdateTheme(UIThemes uiTheme) {
             _theme.ThemeUpdaterService.SetTheme(uiTheme, messageBox);
         }
+        
+        _theme.ThemeChanged += UpdateTheme;
+        _theme.ThemeUpdaterService.SetTheme(_theme.HostTheme, messageBox);
 
         try {
-            _theme.ThemeChanged += UpdateTheme;
-            _theme.ThemeUpdaterService.SetTheme(_theme.HostTheme, messageBox);
-
             (MessageBoxResult closeResult,
                 MessageBoxResult primaryResult,
                 MessageBoxResult secondaryResult) = ShowMessageBox(button, messageBox);
diff --git a/src/dosymep.WpfUI.Core/SimpleServices/WpfUIThemeUpdaterService.cs b/src/dosymep.WpfUI.Core/SimpleServices/WpfUIThemeUpdaterService.cs
index 278d48d..217a338 100644
--- a/src/dosymep.WpfUI.Core/SimpleServices/WpfUIThemeUpdaterService.cs
+++ b/src/dosymep.WpfUI.Core/SimpleServices/WpfUIThemeUpdaterService.cs
@@ -37,7 +37,7 @@ public void SetTheme(UIThemes theme, FrameworkElement frameworkElement) {
         }
 
         if(frameworkElement is Window window) {
-            WindowBackgroundManager.UpdateBackground(window, GetAppTheme(theme), WindowBackdropType.Mica);
+            WindowBackgroundManager.UpdateBackground(window, GetAppTheme(theme), WindowBackdropType.None);
         }
     }
 
diff --git a/src/dosymep.WpfUI.Core/Views/MessageBoxContentTemplate.xaml b/src/dosymep.WpfUI.Core/Views/MessageBoxContentTemplate.xaml
index 50d1fd4..7ac8abd 100644
--- a/src/dosymep.WpfUI.Core/Views/MessageBoxContentTemplate.xaml
+++ b/src/dosymep.WpfUI.Core/Views/MessageBoxContentTemplate.xaml
@@ -2,22 +2,23 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml">
     <DataTemplate x:Key="MessageBoxContentTemplate">
-        <StackPanel
-            Margin="10"
-            Orientation="Horizontal">
+        <DockPanel Margin="8" LastChildFill="True">
             
             <!-- ReSharper disable once Xaml.BindingWithContextNotResolved -->
             <ui:Image
-                Margin="10 0"
+                DockPanel.Dock="Left"
+                Margin="14 0"
                 Height="26"
                 VerticalAlignment="Center"
                 Source="{Binding ImageSource}" />
             
             <!-- ReSharper disable once Xaml.BindingWithContextNotResolved -->
             <ui:TextBlock 
-                Margin="0 0 10 0"
+                Margin="0 0 14 0"
+                TextWrapping="Wrap"
+                TextAlignment="Justify"
                 VerticalAlignment="Center"
                 Text="{Binding MessageBoxText}" />
-        </StackPanel>
+        </DockPanel>
     </DataTemplate>
 </ResourceDictionary>
\ No newline at end of file