diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
index 15bccf626c..e99bb17330 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
@@ -76,6 +76,9 @@
 		<OptionPanel id    = "Application"
 		             label = "${res:Dialog.ProjectOptions.ApplicationSettings}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ApplicationSettings"/>
+		<OptionPanel id    = "Application1"
+		             label = "${res:Dialog.ProjectOptions.ApplicationSettings}"
+		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ApplicationSettingsXaml"/>
 		<OptionPanel id    = "ReferencePaths"
 		             label = "${res:Dialog.ProjectOptions.ReferencePaths}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ReferencePaths"/>
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index a73e7fd21c..6411f91370 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -269,6 +269,10 @@
       <DependentUpon>TaskListOptionsl.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ApplicationSettingsXaml.xaml.cs">
+      <DependentUpon>ApplicationSettingsXaml.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\DebugOptions.xaml.cs">
       <DependentUpon>DebugOptions.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -886,6 +890,7 @@
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\EditStandardHeaderPanel.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\SelectStylePanel.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\TaskListOptionsl.xaml" />
+    <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ApplicationSettingsXaml.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\BuildEvents.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\DebugOptions.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ProjectOptionPanel.xaml">
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs
index 05c63241fc..13f89ea282 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs
@@ -86,7 +86,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 			// maybe make this writable again? Needs special care when saving!
 			Get<TextBox>("projectFile").ReadOnly = true;
 			
-			RefreshStartupObjectEnabled(null, EventArgs.Empty);
+		RefreshStartupObjectEnabled(null, EventArgs.Empty);
 			RefreshOutputNameTextBox(null, EventArgs.Empty);
 			
 			helper.AddConfigurationSelector(this);
@@ -147,7 +147,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 			
 			applicationManifestComboBox.Text = "app.manifest";
 		}
-		
+		//--------------
 		sealed class ManifestBinding : ConfigurationGuiBinding
 		{
 			ComboBox applicationManifestComboBox;
@@ -191,6 +191,8 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 			}
 		}
 		
+		//--------------
+		
 		public static IList<IClass> GetPossibleStartupObjects(IProject project)
 		{
 			List<IClass> results = new List<IClass>();
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettingsXaml.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettingsXaml.xaml
new file mode 100644
index 0000000000..7319b0c9f9
--- /dev/null
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettingsXaml.xaml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<optionpanels:ProjectOptionPanel
+	x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.ApplicationSettingsXaml"
+	xmlns:sys="clr-namespace:System;assembly=mscorlib"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	
+	xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui"
+	xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
+	xmlns:core="http://icsharpcode.net/sharpdevelop/core"
+	xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels"
+	
+	xmlns:project="clr-namespace:ICSharpCode.SharpDevelop.Project">
+	
+	<Grid>
+		<Grid.RowDefinitions>
+			<RowDefinition Height="25"></RowDefinition>
+			<RowDefinition Height="25"></RowDefinition>
+			<RowDefinition Height="25"></RowDefinition>
+			<RowDefinition Height="25"></RowDefinition>
+			<RowDefinition Height="25"></RowDefinition>
+			<RowDefinition Height="25"></RowDefinition>
+			<RowDefinition Height="30"></RowDefinition>
+			<RowDefinition Height="30"></RowDefinition>
+			<RowDefinition Height="25"></RowDefinition>
+			<RowDefinition Height="25"></RowDefinition>
+			<RowDefinition Height="100"></RowDefinition>
+		</Grid.RowDefinitions>
+		
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition
+				Width="40"></ColumnDefinition>
+			<ColumnDefinition Width="150"></ColumnDefinition>
+			<ColumnDefinition></ColumnDefinition>
+		</Grid.ColumnDefinitions>
+		
+		<Label Grid.ColumnSpan="2"
+		       Content="{core:Localize Dialog.ProjectOptions.ApplicationSettings.AssemblyName}"></Label>
+		
+		<optionpanels:StorageLocationPicker Grid.Row="1" Location="{Binding AssemblyName.Location}" DockPanel.Dock="Left" />
+			
+		<TextBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" 
+		         x:Name="assemblyNameTextBox"
+		         TextChanged="RefreshOutputNameTextBox"
+		         Text="{Binding AssemblyName.Value, UpdateSourceTrigger=PropertyChanged}"
+		></TextBox>
+		
+		
+		<Label Grid.Row="2" Grid.ColumnSpan="2" Content="{core:Localize Dialog.ProjectOptions.ApplicationSettings.RootNamespace}"></Label>
+		       
+		<optionpanels:StorageLocationPicker Grid.Row="3" Location="{Binding RootNamespace.Location}" DockPanel.Dock="Left" />
+			
+		<TextBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3" 
+		         x:Name="rootNamespaceTextBox" Text="{Binding RootNamespace.Value,UpdateSourceTrigger=PropertyChanged}"
+		></TextBox>
+		
+		
+		<Label Grid.Row="4" Grid.ColumnSpan="2" Content="{core:Localize Dialog.ProjectOptions.ApplicationSettings.OutputType}"></Label>
+		       
+		<Label Grid.Row="4" Grid.Column="2" Content="{core:Localize Dialog.ProjectOptions.ApplicationSettings.StartupObject}"></Label>
+		       
+		<optionpanels:StorageLocationPicker Grid.Row="5" Location="{Binding OutputType.Location}" DockPanel.Dock="Left" />
+			
+		<ComboBox x:Name="outputTypeComboBox"  Grid.Row="5" Grid.Column="1" Margin="5,0,5,0"
+		          gui:EnumBinding.EnumType="{x:Type project:OutputType}"		
+		          SelectionChanged="OutputTypeComboBox_SelectionChanged">
+		</ComboBox>
+		
+		<ComboBox x:Name="startupObjectComboBox" Margin="5,0,5,0"
+		          Grid.Row="5" Grid.Column="2" IsEnabled="False"></ComboBox>
+		
+		<Image x:Name="applicationIconImage" Width="32" Height="32" Grid.Row="6" ></Image>
+		     
+		<Label Grid.Row="6" Grid.Column="1"
+		       Content="{core:Localize Dialog.ProjectOptions.ApplicationSettings.ApplicationIcon}"></Label>
+		
+	
+		<Grid Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="2">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="30"></ColumnDefinition>
+				<ColumnDefinition Width="8*"></ColumnDefinition>
+				<ColumnDefinition Width="*"></ColumnDefinition>
+			</Grid.ColumnDefinitions>
+			
+			<optionpanels:StorageLocationPicker
+				Location="{Binding ApplicationIcon.Location}" DockPanel.Dock="Left" />
+			
+			<TextBox x:Name="applicationIconTextBox" Grid.Column="1" Margin="5,5,0,0"
+			         TextChanged="ApplicationIconTextBox_TextChanged"
+			         Text="{Binding ApplicationIcon.Value,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+			
+			<Button  Grid.Column="2" Margin="8,5,8,0" Content="..." Click="ApplicationIconButton_Click"></Button>
+			       
+		</Grid>
+		
+		<Label Grid.Row="7" Grid.Column="1" Content="{core:Localize Dialog.ProjectOptions.ApplicationSettings.Manifest}"></Label>
+		
+		<widgets:StackPanelWithSpacing SpaceBetweenItems="3" Grid.Row="7" Grid.Column="2" Orientation="Horizontal">
+			
+			<optionpanels:StorageLocationPicker Location="{Binding PreBuildEvent.Location}" DockPanel.Dock="Left" />
+				
+			<ComboBox x:Name="applicationManifestComboBox" Margin="5,5,0,0"
+			          SelectionChanged="ApplicationManifestComboBox_SelectionChanged" Width="200"></ComboBox>
+		</widgets:StackPanelWithSpacing>
+		
+		<Label Grid.Row="8" Grid.ColumnSpan="2"
+		       Content="{core:Localize Dialog.ProjectOptions.ApplicationSettings.Win32Resource}"></Label>
+		
+		<optionpanels:StorageLocationPicker Grid.Row="9" Location="{Binding Win32Resource .Location}" DockPanel.Dock="Left" />
+			
+		<Grid Grid.Row="9" Grid.Column="2" Grid.ColumnSpan="2">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="8*"></ColumnDefinition>
+				<ColumnDefinition Width="*"></ColumnDefinition>
+			</Grid.ColumnDefinitions>
+			
+			<TextBox x:Name="win32ResourceFileTextBox"  Text="{Binding Win32Resource.Value,UpdateSourceTrigger=PropertyChanged}" ></TextBox>
+			
+			<Button x:Name="Win32ResourceCombo" Content="....." Grid.Column="1" Margin="8,0,0,8" Click="Win32ResourceComboButton_Click"></Button>
+		</Grid>
+		
+		<GroupBox Grid.Row="10" Grid.ColumnSpan="3" Margin="0,5,0,0"
+		          Header="{core:Localize Dialog.ProjectOptions.ApplicationSettings.ProjectInformation}">
+			<Grid Margin="15,0,0,0">
+				<Grid.RowDefinitions>
+					<RowDefinition Height="25"></RowDefinition>
+					<RowDefinition Height="25"></RowDefinition>
+					<RowDefinition Height="25"></RowDefinition>
+				</Grid.RowDefinitions>
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="100"></ColumnDefinition>
+					<ColumnDefinition></ColumnDefinition>
+				</Grid.ColumnDefinitions>
+				
+				<Label Content="{core:Localize Dialog.ProjectOptions.ApplicationSettings.ProjectFolder}"></Label>
+					
+				<TextBox x:Name="projectFolderTextBox" Grid.Column="1"></TextBox>
+				
+				<Label Grid.Row="1" Content="{core:Localize Dialog.ProjectOptions.ApplicationSettings.ProjectFile}"></Label>
+				       
+				<TextBox x:Name="projectFileTextBox"  Grid.Row="1" Grid.Column="1"></TextBox>
+				
+				<Label Grid.Row="2"  Content="{core:Localize Dialog.ProjectOptions.ApplicationSettings.OutputName}"></Label>
+				      
+				<TextBox x:Name="outputNameTextBox"  Grid.Row="2" Grid.Column="1"></TextBox>
+			</Grid>
+		</GroupBox>
+	</Grid>
+</optionpanels:ProjectOptionPanel>
\ No newline at end of file