diff --git a/zaaReloaded2/Commands.cs b/zaaReloaded2/Commands.cs
index 4cf3d33..c6b34d1 100755
--- a/zaaReloaded2/Commands.cs
+++ b/zaaReloaded2/Commands.cs
@@ -20,6 +20,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Bovender.Extensions;
 using zaaReloaded2.Controller;
 using zaaReloaded2.Controller.Comments;
 using zaaReloaded2.Formatter;
@@ -74,7 +75,7 @@ namespace zaaReloaded2
                 DoFormat(settings);
                 UserSettings.Default.LastSettings = settings.Uid;
             };
-            vm.InjectInto<SettingsRepositoryView>().ShowDialog();
+            vm.InjectInto<SettingsRepositoryView>().ShowDialogInForm();
         }
 
         /// <summary>
@@ -121,13 +122,13 @@ namespace zaaReloaded2
         public static void ShowAbout()
         {
             ViewModels.AboutViewModel vm = new ViewModels.AboutViewModel();
-            vm.InjectInto<Views.AboutView>().ShowDialog();
+            vm.InjectInto<Views.AboutView>().ShowDialogInForm();
         }
 
         public static void ShowPreferences()
         {
             ViewModels.PreferencesViewModel vm = new PreferencesViewModel();
-            vm.InjectInto<Views.PreferencesView>().ShowDialog();
+            vm.InjectInto<Views.PreferencesView>().ShowDialogInForm();
         }
 
         public static void ApplyDanielsStyle()
@@ -263,7 +264,7 @@ namespace zaaReloaded2
             {
                 Logger.Info("CommentPool_FillInComment: Requesting user interaction");
                 ItemCommentViewModel vm = new ItemCommentViewModel(e.Comment);
-                vm.InjectInto<ItemCommentView>().ShowDialog();
+                vm.InjectInto<ItemCommentView>().ShowDialogInForm();
             }
         }
 
diff --git a/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml b/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
index e503838..56aae4c 100755
--- a/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
+++ b/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
@@ -25,8 +25,8 @@
         xmlns:ei="http://schemas.microsoft.com/expression/2010/interactions"
         xmlns:settings="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
         xmlns:converter="clr-namespace:Bovender.Mvvm.Converters;assembly=Bovender"
-        SizeToContent="Height" Width="700" ShowInTaskbar="False"
-        WindowStyle="ToolWindow" Topmost="True" ResizeMode="CanResizeWithGrip"
+        SizeToContent="Height" Width="720"
+        ShowInTaskbar="False" ResizeMode="NoResize"
         x:Name="exceptionDetailView"
         Title="Technische Fehlerdetails"
         settings:WindowState.Save="True"
diff --git a/zaaReloaded2/ExceptionHandler/ExceptionView.xaml b/zaaReloaded2/ExceptionHandler/ExceptionView.xaml
index 7154fcd..6ae030b 100755
--- a/zaaReloaded2/ExceptionHandler/ExceptionView.xaml
+++ b/zaaReloaded2/ExceptionHandler/ExceptionView.xaml
@@ -26,8 +26,8 @@
         xmlns:ex="clr-namespace:zaaReloaded2.ExceptionHandler"
         xmlns:actions="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
         xmlns:settings="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
-        SizeToContent="WidthAndHeight" ResizeMode="CanResizeWithGrip"
-        WindowStyle="ToolWindow" ShowInTaskbar="False" Topmost="True"
+        SizeToContent="WidthAndHeight" ResizeMode="NoResize"
+        ShowInTaskbar="False" 
         WindowStartupLocation="CenterScreen"
         Title="zaaReloaded2: Fehler!"
         settings:WindowState.Save="True"
diff --git a/zaaReloaded2/ThisAddIn.cs b/zaaReloaded2/ThisAddIn.cs
index c36f234..fd46177 100755
--- a/zaaReloaded2/ThisAddIn.cs
+++ b/zaaReloaded2/ThisAddIn.cs
@@ -19,6 +19,7 @@ using System;
 using System.IO;
 using Bovender.Versioning;
 using Bovender.Mvvm.Messaging;
+using Bovender.Extensions;
 using zaaReloaded2.ExceptionHandler;
 using System.Windows;
 using System.Windows.Input;
@@ -71,7 +72,8 @@ namespace zaaReloaded2
             Bovender.ExceptionHandler.CentralHandler.ManageExceptionCallback += CentralHandler_ManageExceptionCallback;
             Bovender.Win32Window.MainWindowHandleProvider = () =>
             {
-                return IntPtr.Zero;
+                return System.Diagnostics.Process.GetCurrentProcess().MainWindowHandle;
+                // return IntPtr.Zero;
             };
             Bovender.WpfHelpers.RegisterTextBoxSelectAll();
             UserSettings userSettings = UserSettings.Default;
@@ -172,7 +174,7 @@ namespace zaaReloaded2
         {
             e.IsHandled = true;
             ExceptionViewModel vm = new ExceptionViewModel(e.Exception);
-            vm.InjectInto<ExceptionView>().ShowDialog();
+            vm.InjectInto<ExceptionView>().ShowDialogInForm();
         }
         
         #endregion
diff --git a/zaaReloaded2/Views/AboutView.xaml b/zaaReloaded2/Views/AboutView.xaml
index 6a46e07..a30ab38 100755
--- a/zaaReloaded2/Views/AboutView.xaml
+++ b/zaaReloaded2/Views/AboutView.xaml
@@ -23,6 +23,7 @@
         Width="360" SizeToContent="Height" ResizeMode="NoResize" ShowInTaskbar="False"
         b:WindowState.CenterScreen="True"
         Title="Über..."
+        Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
         >
     <Window.Resources>
         <ResourceDictionary Source="/Bovender;component/Style.xaml" />
diff --git a/zaaReloaded2/Views/ElementPickerView.xaml b/zaaReloaded2/Views/ElementPickerView.xaml
index f4670e0..7ec325c 100755
--- a/zaaReloaded2/Views/ElementPickerView.xaml
+++ b/zaaReloaded2/Views/ElementPickerView.xaml
@@ -21,11 +21,12 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
-        Width="280" Height="320" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
-        WindowStyle="ToolWindow" Topmost="True"
+        Width="360" Height="320"
+        ShowInTaskbar="False" ResizeMode="NoResize"
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
         Title="Neues Element auswählen"
         FocusManager.FocusedElement="{Binding ElementName=treeview}"
+        Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
         >
     <Window.Resources>
         <ResourceDictionary Source="/Bovender;component/Style.xaml" />
diff --git a/zaaReloaded2/Views/ElementView.xaml b/zaaReloaded2/Views/ElementView.xaml
index 352e3df..65a958d 100755
--- a/zaaReloaded2/Views/ElementView.xaml
+++ b/zaaReloaded2/Views/ElementView.xaml
@@ -21,13 +21,13 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
-        ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
-        WindowStyle="ToolWindow" Topmost="True"
-        Width="280" Height="180" MinWidth="280" MinHeight="180"
+        ResizeMode="NoResize" ShowInTaskbar="False"
+        Width="460" Height="180" MinWidth="280" MinHeight="180"
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
         Title="Element bearbeiten"
         FocusManager.FocusedElement="{Binding ElementName=ContentTextBox}"
-        >
+        Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
+       >
     <Window.Resources>
         <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
diff --git a/zaaReloaded2/Views/FirstRunView.xaml b/zaaReloaded2/Views/FirstRunView.xaml
index 9fec32a..ef80bfe 100755
--- a/zaaReloaded2/Views/FirstRunView.xaml
+++ b/zaaReloaded2/Views/FirstRunView.xaml
@@ -23,10 +23,11 @@
         xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
         xmlns:action="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
-        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
+        ResizeMode="NoResize" ShowInTaskbar="False" 
         SizeToContent="Height"  Width="480"
         b:WindowState.CenterScreen="True"
         Title="Willkommen bei zaaReloaded"
+        Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
         >
     <Window.Resources>
          <ResourceDictionary Source="/Bovender;component/Style.xaml" />
diff --git a/zaaReloaded2/Views/IoErrorView.xaml b/zaaReloaded2/Views/IoErrorView.xaml
index 56b7981..eec193a 100755
--- a/zaaReloaded2/Views/IoErrorView.xaml
+++ b/zaaReloaded2/Views/IoErrorView.xaml
@@ -22,10 +22,10 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
         SizeToContent="WidthAndHeight" MaxWidth="480"
-        WindowStyle="ToolWindow" Topmost="True"
         ResizeMode="NoResize" ShowInTaskbar="False"
         b:WindowState.CenterScreen="True"
         Title="Import/Export-Fehler"
+        Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
         >
     <Window.Resources>
         <ResourceDictionary Source="/Bovender;component/Style.xaml" />
diff --git a/zaaReloaded2/Views/ItemCommentView.xaml b/zaaReloaded2/Views/ItemCommentView.xaml
index 3ae97d6..04a1761 100755
--- a/zaaReloaded2/Views/ItemCommentView.xaml
+++ b/zaaReloaded2/Views/ItemCommentView.xaml
@@ -21,12 +21,12 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
-        ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
-        WindowStyle="ToolWindow" Topmost="True"
+        ResizeMode="NoResize" ShowInTaskbar="False"
         SizeToContent="WidthAndHeight" MaxWidth="500"
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
         Title="Kommentar angeben"
         FocusManager.FocusedElement="{Binding ElementName=ValueTextBox}"
+        Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
         >
     <Window.Resources>
         <ResourceDictionary Source="/Bovender;component/Style.xaml" />
@@ -42,7 +42,7 @@
         <TextBlock DockPanel.Dock="Left" Text="{Binding Prefix}" VerticalAlignment="Center" />
         <TextBlock DockPanel.Dock="Right" Text="{Binding Suffix}" VerticalAlignment="Center" />
         <TextBox Text="{Binding Value,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                    MinWidth="120" MaxWidth="240" VerticalAlignment="Center"
-                    x:Name="ValueTextBox" Margin="5 0 5 0" />
+                    MinWidth="240" MaxWidth="240" VerticalAlignment="Center"
+                    x:Name="ValueTextBox" />
     </DockPanel>
 </Window>
diff --git a/zaaReloaded2/Views/PreferencesView.xaml b/zaaReloaded2/Views/PreferencesView.xaml
index 25473a7..2d9748f 100755
--- a/zaaReloaded2/Views/PreferencesView.xaml
+++ b/zaaReloaded2/Views/PreferencesView.xaml
@@ -24,9 +24,10 @@
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
         xmlns:action="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
         SizeToContent="WidthAndHeight" ResizeMode="NoResize"
-        ShowInTaskbar="False" Topmost="True"
+        ShowInTaskbar="False" 
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
         Title="Einstellungen"
+        Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
         >
     <Window.Resources>
          <ResourceDictionary Source="/Bovender;component/Style.xaml" />
diff --git a/zaaReloaded2/Views/SettingsRepositoryView.xaml b/zaaReloaded2/Views/SettingsRepositoryView.xaml
index 31bc374..dd83e9d 100755
--- a/zaaReloaded2/Views/SettingsRepositoryView.xaml
+++ b/zaaReloaded2/Views/SettingsRepositoryView.xaml
@@ -23,9 +23,9 @@
         xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
         xmlns:action="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
-        Width="480" Height="340"
-        MinWidth="420" MinHeight="340" WindowStyle="ToolWindow"
-        ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
+        Width="520" Height="320"
+        Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
+        ShowInTaskbar="False" ResizeMode="NoResize"
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
         Title="Stil auswählen"
         FocusManager.FocusedElement="{Binding ElementName=settingsList}"
diff --git a/zaaReloaded2/Views/SettingsView.xaml b/zaaReloaded2/Views/SettingsView.xaml
index 7ddf011..d9fe22a 100755
--- a/zaaReloaded2/Views/SettingsView.xaml
+++ b/zaaReloaded2/Views/SettingsView.xaml
@@ -23,12 +23,13 @@
         xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
         xmlns:action="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
-        Width="460" Height="400" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
+        Width="600" Height="420"
+        ResizeMode="CanResizeWithGrip" ShowInTaskbar="True"
         MinWidth="460" MinHeight="400"
-        WindowStyle="ToolWindow" Topmost="True"
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
         Title="Stil bearbeiten"
         FocusManager.FocusedElement="{Binding ElementName=NameTextBox}"
+        Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
         >
     <Window.Resources>
          <ResourceDictionary Source="/Bovender;component/Style.xaml" />