diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
index 9660448c17..6d4b519886 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
@@ -62,7 +62,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Configuration\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Resources\BuildOptions.xfrm" />
     <EmbeddedResource Include="Resources\MyNamespaceSupportForCSharp.cs" />
     <Compile Include="Src\CodeManipulation.cs" />
     <Compile Include="Src\CSharpAdvancedHighlighter.cs" />
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/BuildOptions.xfrm b/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/BuildOptions.xfrm
deleted file mode 100644
index 11b6f38c8b..0000000000
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/BuildOptions.xfrm
+++ /dev/null
@@ -1,398 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="cSharpBuildOptionsPanel" />
-    <ClientSize value="{Width=527, Height=684}" />
-    <AutoScroll value="True" />
-    <Controls>
-      <System.Windows.Forms.GroupBox>
-        <Name value="generalGroupBox" />
-        <Location value="3, 3" />
-        <UseCompatibleTextRendering value="True" />
-        <Text value="${res:Dialog.ProjectOptions.BuildOptions.General}" />
-        <Size value="521, 146" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="0" />
-        <Controls>
-          <System.Windows.Forms.Label>
-            <Name value="conditionalSymbolsLabel" />
-            <Location value="6, 16" />
-            <UseCompatibleTextRendering value="True" />
-            <Text value="${res:Dialog.ProjectOptions.BuildOptions.ConditionalSymbols}" />
-            <Size value="509, 16" />
-            <TextAlign value="BottomLeft" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="0" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.TextBox>
-            <Name value="conditionalSymbolsTextBox" />
-            <TabIndex value="1" />
-            <Location value="6, 36" />
-            <Anchor value="Top, Left, Right" />
-            <Size value="509, 20" />
-          </System.Windows.Forms.TextBox>
-          <System.Windows.Forms.CheckBox>
-            <Name value="optimizeCodeCheckBox" />
-            <Location value="6, 60" />
-            <Text value="${res:Dialog.ProjectOptions.BuildOptions.OptimizeCode}" />
-            <TabIndex value="2" />
-            <Size value="509, 21" />
-            <UseCompatibleTextRendering value="True" />
-            <Anchor value="Top, Left, Right" />
-          </System.Windows.Forms.CheckBox>
-          <System.Windows.Forms.CheckBox>
-            <Name value="allowUnsafeCodeCheckBox" />
-            <Location value="6, 80" />
-            <Text value="${res:Dialog.ProjectOptions.BuildOptions.AllowUnsafeCode}" />
-            <TabIndex value="3" />
-            <Size value="509, 21" />
-            <UseCompatibleTextRendering value="True" />
-            <Anchor value="Top, Left, Right" />
-          </System.Windows.Forms.CheckBox>
-          <System.Windows.Forms.CheckBox>
-            <Name value="checkForOverflowCheckBox" />
-            <Location value="6, 100" />
-            <Text value="${res:Dialog.ProjectOptions.BuildOptions.CheckForOverflow}" />
-            <TabIndex value="4" />
-            <Size value="509, 21" />
-            <UseCompatibleTextRendering value="True" />
-            <Anchor value="Top, Left, Right" />
-          </System.Windows.Forms.CheckBox>
-          <System.Windows.Forms.CheckBox>
-            <Name value="noCorlibCheckBox" />
-            <Location value="6, 120" />
-            <Text value="${res:Dialog.ProjectOptions.BuildOptions.NoCorlib}" />
-            <TabIndex value="5" />
-            <Size value="509, 21" />
-            <UseCompatibleTextRendering value="True" />
-            <Anchor value="Top, Left, Right" />
-          </System.Windows.Forms.CheckBox>
-        </Controls>
-      </System.Windows.Forms.GroupBox>
-      <System.Windows.Forms.GroupBox>
-        <Name value="outputGroupBox" />
-        <Location value="3, 152" />
-        <UseCompatibleTextRendering value="True" />
-        <Text value="${res:Dialog.ProjectOptions.Build.Output}" />
-        <Size value="521, 362" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="1" />
-        <Controls>
-          <System.Windows.Forms.Button>
-            <Name value="projectUpdateButton" />
-            <Location value="337, 106" />
-            <Text value="Change" />
-            <UseVisualStyleBackColor value="True" />
-            <Size value="173, 23" />
-            <TabIndex value="12" />
-          </System.Windows.Forms.Button>
-          <System.Windows.Forms.Label>
-            <Name value="outputPathLabel" />
-            <Location value="12, 17" />
-            <UseCompatibleTextRendering value="True" />
-            <Text value="${res:Dialog.ProjectOptions.Build.OutputPath}" />
-            <Size value="509, 16" />
-            <TextAlign value="BottomLeft" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="3" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.TextBox>
-            <Name value="outputPathTextBox" />
-            <TabIndex value="4" />
-            <Location value="12, 37" />
-            <Anchor value="Top, Left, Right" />
-            <Size value="465, 20" />
-          </System.Windows.Forms.TextBox>
-          <System.Windows.Forms.Button>
-            <Name value="outputPathBrowseButton" />
-            <Location value="481, 37" />
-            <UseCompatibleTextRendering value="True" />
-            <Text value="..." />
-            <Size value="40, 21" />
-            <Anchor value="Top, Right" />
-            <TabIndex value="5" />
-          </System.Windows.Forms.Button>
-          <System.Windows.Forms.CheckBox>
-            <Name value="xmlDocumentationCheckBox" />
-            <Location value="12, 61" />
-            <Text value="${res:Dialog.ProjectOptions.Build.XmlDocumentationFile}" />
-            <TabIndex value="6" />
-            <Size value="154, 21" />
-            <UseCompatibleTextRendering value="True" />
-          </System.Windows.Forms.CheckBox>
-          <System.Windows.Forms.TextBox>
-            <Name value="xmlDocumentationTextBox" />
-            <TabIndex value="7" />
-            <Location value="170, 61" />
-            <Anchor value="Top, Left, Right" />
-            <Size value="350, 20" />
-          </System.Windows.Forms.TextBox>
-          <System.Windows.Forms.Label>
-            <Name value="debugInfoLabel" />
-            <Location value="12, 85" />
-            <UseCompatibleTextRendering value="True" />
-            <Text value="${res:Dialog.ProjectOptions.Build.DebugInfo}" />
-            <Size value="154, 16" />
-            <TextAlign value="MiddleRight" />
-            <TabIndex value="8" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.ComboBox>
-            <Name value="debugInfoComboBox" />
-            <TabIndex value="9" />
-            <Location value="170, 85" />
-            <Size value="161, 21" />
-            <DropDownStyle value="DropDownList" />
-          </System.Windows.Forms.ComboBox>
-          <System.Windows.Forms.Label>
-            <Name value="targetFrameworkLabel" />
-            <Location value="12, 109" />
-            <UseCompatibleTextRendering value="True" />
-            <Text value="${res:Dialog.ProjectOptions.Build.TargetFramework}" />
-            <Size value="154, 16" />
-            <TextAlign value="MiddleRight" />
-            <TabIndex value="10" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.ComboBox>
-            <Name value="targetFrameworkComboBox" />
-            <TabIndex value="11" />
-            <Location value="170, 109" />
-            <Size value="161, 21" />
-            <DropDownStyle value="DropDownList" />
-          </System.Windows.Forms.ComboBox>
-          <System.Windows.Forms.GroupBox>
-            <Name value="advancedOutputGroupBox" />
-            <Location value="6, 136" />
-            <UseCompatibleTextRendering value="True" />
-            <Text value="${res:Dialog.ProjectOptions.Build.Advanced}" />
-            <Size value="509, 220" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="9" />
-            <Controls>
-              <System.Windows.Forms.Panel>
-                <Name value="platformSpecificOptionsPanel" />
-                <Location value="6, 14" />
-                <TabIndex value="9" />
-                <Size value="497, 121" />
-                <Anchor value="Top, Left, Right" />
-                <Controls>
-                  <System.Windows.Forms.Label>
-                    <Name value="generateSerializationAssemblyLabel" />
-                    <Location value="3, 23" />
-                    <UseCompatibleTextRendering value="True" />
-                    <Text value="${res:Dialog.ProjectOptions.Build.GenerateSerializationAssembly}" />
-                    <Size value="180, 16" />
-                    <TextAlign value="MiddleRight" />
-                    <TabIndex value="1" />
-                  </System.Windows.Forms.Label>
-                  <System.Windows.Forms.TextBox>
-                    <Name value="dllBaseAddressTextBox" />
-                    <TabIndex value="8" />
-                    <Location value="189, 95" />
-                    <Size value="140, 20" />
-                  </System.Windows.Forms.TextBox>
-                  <System.Windows.Forms.Label>
-                    <Name value="dllBaseAddressLabel" />
-                    <Location value="3, 95" />
-                    <UseCompatibleTextRendering value="True" />
-                    <Text value="${res:Dialog.ProjectOptions.Build.DLLBaseAddress}" />
-                    <Size value="180, 16" />
-                    <TextAlign value="MiddleRight" />
-                    <TabIndex value="7" />
-                  </System.Windows.Forms.Label>
-                  <System.Windows.Forms.CheckBox>
-                    <Name value="registerCOMInteropCheckBox" />
-                    <Location value="177, 1" />
-                    <Text value="${res:Dialog.ProjectOptions.Build.RegisterForCOM}" />
-                    <TabIndex value="0" />
-                    <Size value="317, 21" />
-                    <UseCompatibleTextRendering value="True" />
-                    <Anchor value="Top, Left, Right" />
-                  </System.Windows.Forms.CheckBox>
-                  <System.Windows.Forms.ComboBox>
-                    <Name value="fileAlignmentComboBox" />
-                    <TabIndex value="6" />
-                    <Location value="189, 71" />
-                    <Size value="180, 21" />
-                    <FormattingEnabled value="True" />
-                    <DropDownStyle value="DropDownList" />
-                  </System.Windows.Forms.ComboBox>
-                  <System.Windows.Forms.Label>
-                    <Name value="fileAlignmentLabel" />
-                    <Location value="3, 71" />
-                    <UseCompatibleTextRendering value="True" />
-                    <Text value="${res:Dialog.ProjectOptions.Build.FileAlignment}" />
-                    <Size value="180, 16" />
-                    <TextAlign value="MiddleRight" />
-                    <TabIndex value="5" />
-                  </System.Windows.Forms.Label>
-                  <System.Windows.Forms.ComboBox>
-                    <Name value="targetCpuComboBox" />
-                    <TabIndex value="4" />
-                    <Location value="189, 47" />
-                    <Size value="180, 21" />
-                    <FormattingEnabled value="True" />
-                    <DropDownStyle value="DropDownList" />
-                  </System.Windows.Forms.ComboBox>
-                  <System.Windows.Forms.Label>
-                    <Name value="targetCpuLabel" />
-                    <Location value="3, 47" />
-                    <UseCompatibleTextRendering value="True" />
-                    <Text value="${res:Dialog.ProjectOptions.Build.TargetCPU}" />
-                    <Size value="180, 16" />
-                    <TextAlign value="MiddleRight" />
-                    <TabIndex value="3" />
-                  </System.Windows.Forms.Label>
-                  <System.Windows.Forms.ComboBox>
-                    <Name value="generateSerializationAssemblyComboBox" />
-                    <TabIndex value="2" />
-                    <Location value="189, 23" />
-                    <Size value="180, 21" />
-                    <FormattingEnabled value="True" />
-                    <DropDownStyle value="DropDownList" />
-                  </System.Windows.Forms.ComboBox>
-                </Controls>
-              </System.Windows.Forms.Panel>
-              <System.Windows.Forms.Label>
-                <Name value="baseIntermediateOutputPathLabel" />
-                <Location value="6, 134" />
-                <UseCompatibleTextRendering value="True" />
-                <Text value="${res:Dialog.ProjectOptions.Build.BaseIntermediateOutputPath}" />
-                <Size value="497, 16" />
-                <TextAlign value="BottomLeft" />
-                <Anchor value="Top, Left, Right" />
-                <TabIndex value="0" />
-              </System.Windows.Forms.Label>
-              <System.Windows.Forms.TextBox>
-                <Name value="baseIntermediateOutputPathTextBox" />
-                <TabIndex value="1" />
-                <Location value="6, 153" />
-                <Anchor value="Top, Left, Right" />
-                <Size value="446, 20" />
-              </System.Windows.Forms.TextBox>
-              <System.Windows.Forms.Button>
-                <Name value="baseIntermediateOutputPathBrowseButton" />
-                <Location value="463, 153" />
-                <UseCompatibleTextRendering value="True" />
-                <Text value="..." />
-                <Size value="40, 21" />
-                <Anchor value="Top, Right" />
-                <TabIndex value="2" />
-              </System.Windows.Forms.Button>
-              <System.Windows.Forms.Label>
-                <Name value="intermediateOutputPathLabel" />
-                <Location value="6, 177" />
-                <UseCompatibleTextRendering value="True" />
-                <Text value="${res:Dialog.ProjectOptions.Build.IntermediateOutputPath}" />
-                <Size value="497, 16" />
-                <TextAlign value="BottomLeft" />
-                <Anchor value="Top, Left, Right" />
-                <TabIndex value="0" />
-              </System.Windows.Forms.Label>
-              <System.Windows.Forms.TextBox>
-                <Name value="intermediateOutputPathTextBox" />
-                <TabIndex value="1" />
-                <Location value="6, 193" />
-                <Anchor value="Top, Left, Right" />
-                <Size value="446, 20" />
-              </System.Windows.Forms.TextBox>
-              <System.Windows.Forms.Button>
-                <Name value="intermediateOutputPathBrowseButton" />
-                <Location value="463, 192" />
-                <UseCompatibleTextRendering value="True" />
-                <Text value="..." />
-                <Size value="40, 21" />
-                <Anchor value="Top, Right" />
-                <TabIndex value="2" />
-              </System.Windows.Forms.Button>
-            </Controls>
-          </System.Windows.Forms.GroupBox>
-        </Controls>
-      </System.Windows.Forms.GroupBox>
-      <System.Windows.Forms.GroupBox>
-        <Name value="warningsGroupBox" />
-        <Location value="3, 518" />
-        <UseCompatibleTextRendering value="True" />
-        <Text value="${res:Dialog.ProjectOptions.Build.ErrorsAndWarnings}" />
-        <Size value="521, 66" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="2" />
-        <Controls>
-          <System.Windows.Forms.Label>
-            <Name value="warningLevelLabel" />
-            <Location value="6, 16" />
-            <UseCompatibleTextRendering value="True" />
-            <Text value="${res:Dialog.ProjectOptions.Build.WarningLevel}" />
-            <Size value="154, 16" />
-            <TextAlign value="MiddleRight" />
-            <TabIndex value="0" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.ComboBox>
-            <Name value="warningLevelComboBox" />
-            <TabIndex value="1" />
-            <Location value="164, 16" />
-            <Size value="60, 21" />
-            <FormattingEnabled value="True" />
-            <DropDownStyle value="DropDownList" />
-          </System.Windows.Forms.ComboBox>
-          <System.Windows.Forms.Label>
-            <Name value="suppressWarningsLabel" />
-            <Location value="6, 40" />
-            <UseCompatibleTextRendering value="True" />
-            <Text value="${res:Dialog.ProjectOptions.Build.SuppressWarnings}" />
-            <Size value="154, 16" />
-            <TextAlign value="MiddleRight" />
-            <TabIndex value="2" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.TextBox>
-            <Name value="suppressWarningsTextBox" />
-            <TabIndex value="3" />
-            <Location value="164, 40" />
-            <Anchor value="Top, Left, Right" />
-            <Size value="350, 20" />
-          </System.Windows.Forms.TextBox>
-        </Controls>
-      </System.Windows.Forms.GroupBox>
-      <System.Windows.Forms.GroupBox>
-        <Name value="treatWarningsAsErrorsGroupBox" />
-        <Location value="3, 588" />
-        <UseCompatibleTextRendering value="True" />
-        <Text value="${res:Dialog.ProjectOptions.Build.TreatWarningsAsErrors}" />
-        <Size value="521, 92" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="3" />
-        <Controls>
-          <System.Windows.Forms.RadioButton>
-            <Name value="noneRadioButton" />
-            <Location value="6, 20" />
-            <UseCompatibleTextRendering value="True" />
-            <Text value="${res:Dialog.ProjectOptions.Build.TreatWarningsAsErrors.None}" />
-            <Size value="154, 21" />
-            <TabIndex value="0" />
-          </System.Windows.Forms.RadioButton>
-          <System.Windows.Forms.RadioButton>
-            <Name value="specificWarningsRadioButton" />
-            <Location value="6, 42" />
-            <UseCompatibleTextRendering value="True" />
-            <Text value="${res:Dialog.ProjectOptions.Build.TreatWarningsAsErrors.Specific}" />
-            <Size value="154, 21" />
-            <TabIndex value="1" />
-          </System.Windows.Forms.RadioButton>
-          <System.Windows.Forms.RadioButton>
-            <Name value="allRadioButton" />
-            <Location value="6, 65" />
-            <UseCompatibleTextRendering value="True" />
-            <Text value="${res:Dialog.ProjectOptions.Build.TreatWarningsAsErrors.All}" />
-            <Size value="154, 21" />
-            <TabIndex value="3" />
-          </System.Windows.Forms.RadioButton>
-          <System.Windows.Forms.TextBox>
-            <Name value="specificWarningsTextBox" />
-            <TabIndex value="2" />
-            <Location value="164, 42" />
-            <Anchor value="Top, Left, Right" />
-            <Size value="351, 20" />
-          </System.Windows.Forms.TextBox>
-        </Controls>
-      </System.Windows.Forms.GroupBox>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-</Components>
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj
index 07a7f81e3f..78a513458c 100644
--- a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj
+++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj
@@ -96,10 +96,7 @@
     <Compile Include="Project\ResourceScript.cs" />
     <Compile Include="Project\SpecifyCliRuntimeLibraryCommand.cs" />
     <Compile Include="Project\CppProject.cs" />
-    <Compile Include="Project\StringListEditorDialog.xaml.cs">
-      <DependentUpon>StringListEditorDialog.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="Project\StringListEditorDialog.xaml.cs" />
     <None Include="CppBinding.addin">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml.cs b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml.cs
index b9186c4b2d..4abc514ec2 100644
--- a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml.cs
+++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml.cs
@@ -11,6 +11,7 @@ using System.Windows;
 using System.Windows.Controls;
 
 using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using ICSharpCode.SharpDevelop.Project;
 
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index 8b93742a5e..14f49e6182 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -281,8 +281,8 @@
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\KeyValuePair.cs" />
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\OptionsHelper.cs" />
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ProjectOptionPanel.cs" />
-    <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ReferencePathsXAML.xaml.cs">
-      <DependentUpon>ReferencePathsXAML.xaml</DependentUpon>
+    <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ReferencePaths.xaml.cs">
+      <DependentUpon>ReferencePaths.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\SigningXaml.xaml.cs">
@@ -747,7 +747,6 @@
     <Compile Include="Src\Services\Tasks\TaskEventHandler.cs" />
     <Compile Include="Src\Gui\Pads\DefinitionViewPad.cs" />
     <Compile Include="Src\Project\MSBuildEnums.cs" />
-    <EmbeddedResource Include="Resources\ProjectOptions\old_ApplicationSettings.xfrm" />
     <Compile Include="Src\Gui\Pads\PropertyPad\IDEContainer.cs" />
     <Compile Include="Src\Gui\Pads\PropertyPad\PropertyContainer.cs" />
     <EmbeddedResource Include="Resources\ProjectOptions\Publish.xfrm" />
@@ -913,7 +912,7 @@
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ProjectOptionPanel.xaml">
       <DependentUpon>ProjectOptionPanel.cs</DependentUpon>
     </Page>
-    <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ReferencePathsXAML.xaml" />
+    <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ReferencePaths.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\SigningXaml.xaml" />
     <Page Include="Src\Gui\Dialogs\ReferenceDialog\ServiceReference\AddServiceReferenceDialog.xaml" />
     <Page Include="Src\Gui\Dialogs\ReferenceDialog\ServiceReference\AdvancedServiceDialog.xaml" />
diff --git a/src/Main/Base/Project/Resources/ProjectOptions/old_ApplicationSettings.xfrm b/src/Main/Base/Project/Resources/ProjectOptions/old_ApplicationSettings.xfrm
deleted file mode 100644
index e4145a810a..0000000000
--- a/src/Main/Base/Project/Resources/ProjectOptions/old_ApplicationSettings.xfrm
+++ /dev/null
@@ -1,197 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="XmlUserControl1" />
-    <ClientSize value="{Width=456, Height=381}" />
-    <Controls>
-      <System.Windows.Forms.ComboBox>
-        <Name value="applicationManifestComboBox" />
-        <TabIndex value="12" />
-        <Location value="173, 166" />
-        <Size value="275, 21" />
-      </System.Windows.Forms.ComboBox>
-      <System.Windows.Forms.Label>
-        <Name value="label10" />
-        <Location value="41, 166" />
-        <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.Manifest}" />
-        <Size value="126, 20" />
-        <TextAlign value="MiddleRight" />
-        <TabIndex value="11" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Button>
-        <Name value="win32ResourceFileBrowseButton" />
-        <Location value="408, 221" />
-        <Text value="..." />
-        <Size value="40, 21" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="16" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.TextBox>
-        <Name value="win32ResourceFileTextBox" />
-        <TabIndex value="15" />
-        <Location value="8, 221" />
-        <Anchor value="Top, Left, Right" />
-        <Size value="392, 20" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="label9" />
-        <Location value="8, 205" />
-        <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.Win32Resource}" />
-        <Size value="436, 16" />
-        <TextAlign value="BottomLeft" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="14" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.Button>
-        <Name value="applicationIconBrowseButton" />
-        <Location value="408, 139" />
-        <Text value="..." />
-        <Size value="40, 21" />
-        <Anchor value="Top, Right" />
-        <TabIndex value="10" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.GroupBox>
-        <Name value="groupBox1" />
-        <Location value="8, 248" />
-        <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.ProjectInformation}" />
-        <Size value="440, 112" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="17" />
-        <Controls>
-          <System.Windows.Forms.TextBox>
-            <Name value="outputNameTextBox" />
-            <TabIndex value="5" />
-            <Location value="112, 80" />
-            <Anchor value="Top, Left, Right" />
-            <ReadOnly value="True" />
-            <Size value="320, 20" />
-          </System.Windows.Forms.TextBox>
-          <System.Windows.Forms.Label>
-            <Name value="label8" />
-            <Location value="8, 80" />
-            <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.OutputName}" />
-            <Size value="100, 23" />
-            <TextAlign value="MiddleRight" />
-            <TabIndex value="4" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.TextBox>
-            <Name value="projectFileTextBox" />
-            <TabIndex value="3" />
-            <Location value="112, 56" />
-            <Anchor value="Top, Left, Right" />
-            <Size value="320, 20" />
-          </System.Windows.Forms.TextBox>
-          <System.Windows.Forms.Label>
-            <Name value="label7" />
-            <Location value="8, 52" />
-            <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.ProjectFile}" />
-            <Size value="100, 23" />
-            <TextAlign value="MiddleRight" />
-            <TabIndex value="2" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.TextBox>
-            <Name value="projectFolderTextBox" />
-            <TabIndex value="1" />
-            <Location value="112, 28" />
-            <Anchor value="Top, Left, Right" />
-            <ReadOnly value="True" />
-            <Size value="320, 20" />
-          </System.Windows.Forms.TextBox>
-          <System.Windows.Forms.Label>
-            <Name value="label6" />
-            <Location value="8, 24" />
-            <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.ProjectFolder}" />
-            <Size value="100, 23" />
-            <TextAlign value="MiddleRight" />
-            <TabIndex value="0" />
-          </System.Windows.Forms.Label>
-        </Controls>
-      </System.Windows.Forms.GroupBox>
-      <System.Windows.Forms.PictureBox>
-        <Name value="applicationIconPictureBox" />
-        <Location value="3, 141" />
-        <Size value="32, 32" />
-        <SizeMode value="StretchImage" />
-      </System.Windows.Forms.PictureBox>
-      <System.Windows.Forms.TextBox>
-        <Name value="applicationIconTextBox" />
-        <TabIndex value="9" />
-        <Location value="173, 140" />
-        <Anchor value="Top, Left, Right" />
-        <Size value="227, 20" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="label5" />
-        <Location value="41, 141" />
-        <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.ApplicationIcon}" />
-        <Size value="126, 16" />
-        <TextAlign value="BottomRight" />
-        <TabIndex value="8" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.ComboBox>
-        <Name value="startupObjectComboBox" />
-        <TabIndex value="7" />
-        <Location value="173, 112" />
-        <Anchor value="Top, Left, Right" />
-        <Size value="275, 21" />
-        <FormattingEnabled value="True" />
-      </System.Windows.Forms.ComboBox>
-      <System.Windows.Forms.Label>
-        <Name value="label4" />
-        <Location value="173, 96" />
-        <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.StartupObject}" />
-        <Size value="275, 16" />
-        <TextAlign value="BottomLeft" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="6" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.ComboBox>
-        <Name value="outputTypeComboBox" />
-        <TabIndex value="5" />
-        <Location value="8, 112" />
-        <Size value="159, 21" />
-        <FormattingEnabled value="True" />
-        <DropDownStyle value="DropDownList" />
-      </System.Windows.Forms.ComboBox>
-      <System.Windows.Forms.Label>
-        <Name value="label3" />
-        <Location value="8, 96" />
-        <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.OutputType}" />
-        <Size value="159, 16" />
-        <TextAlign value="BottomLeft" />
-        <TabIndex value="4" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.TextBox>
-        <Name value="rootNamespaceTextBox" />
-        <TabIndex value="3" />
-        <Location value="8, 68" />
-        <Anchor value="Top, Left, Right" />
-        <Size value="440, 20" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="label2" />
-        <Location value="8, 52" />
-        <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.RootNamespace}" />
-        <Size value="440, 16" />
-        <TextAlign value="BottomLeft" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="2" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.TextBox>
-        <Name value="assemblyNameTextBox" />
-        <TabIndex value="1" />
-        <Location value="8, 24" />
-        <Anchor value="Top, Left, Right" />
-        <Size value="440, 20" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="label1" />
-        <Location value="8, 8" />
-        <Text value="${res:Dialog.ProjectOptions.ApplicationSettings.AssemblyName}" />
-        <Size value="440, 16" />
-        <TextAlign value="BottomLeft" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="0" />
-      </System.Windows.Forms.Label>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-</Components>
\ No newline at end of file
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePathsXAML.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.xaml
similarity index 100%
rename from src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePathsXAML.xaml
rename to src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.xaml
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePathsXAML.xaml.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.xaml.cs
similarity index 100%
rename from src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePathsXAML.xaml.cs
rename to src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.xaml.cs
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/SigningXaml.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/SigningXaml.xaml
index d344589bfe..e3f04bfa11 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/SigningXaml.xaml
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/SigningXaml.xaml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <optionpanels:ProjectOptionPanel
-	x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.SigningXaml" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels" xmlns:local="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels" xmlns:projects="clr-namespace:ICSharpCode.SharpDevelop.Project" xmlns:core="http://icsharpcode.net/sharpdevelop/core">
+	x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.SigningXaml"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels"
+	xmlns:local="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels"
+	xmlns:projects="clr-namespace:ICSharpCode.SharpDevelop.Project"
+	xmlns:core="http://icsharpcode.net/sharpdevelop/core">
+	<optionpanels:ProjectOptionPanel.Resources>
+		<optionpanels:StringToBoolConverter
+			x:Key="strTobool"></optionpanels:StringToBoolConverter>
+	</optionpanels:ProjectOptionPanel.Resources>	
 	<StackPanel
 		Orientation="Vertical">
 		<GroupBox
@@ -37,11 +47,8 @@ Command="{Binding DataContext.Cmd, RelativeSource={RelativeSource FindAncestor,
 					x:Name="signAssemblyCheckBox"
 					Grid.Column="1"
 					VerticalAlignment="Center"
-					Command="{Binding DataContext.Cmd, RelativeSource={RelativeSource FindAncestor,
-					AncestorType={x:Type UserControl}}}"
-					
-					CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}"
-					Content="{core:Localize Dialog.ProjectOptions.Signing.SignAssembly}">
+					IsChecked="{Binding SignAssembly.Value,Converter={StaticResource strTobool}}"
+				>
 				</CheckBox>
 				<Label
 					Grid.Row="1"
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/SigningXaml.xaml.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/SigningXaml.xaml.cs
index 900f8691ab..a3e3c0c767 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/SigningXaml.xaml.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/SigningXaml.xaml.cs
@@ -35,15 +35,8 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 
 		}
 		
-		private void Initialize()
-		{
-			Cmd = new RelayCommand<bool>(CheckExecute);
-		}
-		
-		
-		
 		public ProjectProperty<String> SignAssembly {
-			get { return GetProperty("SignAssembly","", TextBoxEditMode.EditEvaluatedProperty); }
+			get { return GetProperty("SignAssembly","false", TextBoxEditMode.EditEvaluatedProperty); }
 		}
 		
 		
@@ -51,29 +44,5 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 			get { return GetProperty("AssemblyOriginatorKeyFile","", TextBoxEditMode.EditEvaluatedProperty); }
 		}
 		
-		
-		#region overrides
-		
-		protected override void Load(MSBuildBasedProject project, string configuration, string platform)
-		{
-			base.Load(project, configuration, platform);
-			Console.WriteLine("sign {0}",SignAssembly.Value.ToString());
-			//this.project = project;
-			Console.WriteLine("sign {0}",SignAssembly.Value.ToString());
-			Initialize();				
-			string prop  = GetProperty("SignAssembly", "", TextBoxEditMode.EditRawProperty).Value.ToString();
-		}
-		#endregion
-		
-		public RelayCommand<bool> Cmd {get;set;}
-		
-		
-		private void CheckExecute(bool isChecked)
-		{
-			Console.WriteLine(" Checkbox ischecked {0}",isChecked);
-			IsDirty = true;
-			SignAssembly.Value = "False";
-		}
-			
 	}
 }
\ No newline at end of file