diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index 308f6d39a6..66ff0d6ed1 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -1245,6 +1245,11 @@
 			<OptionPanel id    = "ExternalTools"
 			             label = "${res:Dialog.Options.ExternalToolsText}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ExternalToolPane"/>
+			
+			<OptionPanel id    = "ExternalTools1"
+			             label = "${res:Dialog.Options.ExternalToolsText}"
+			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ExternalToolPanelXaml"/>
+			
 			<OptionPanel id    = "ServiceReferences"
 			             label = "Service References"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ServiceReference.ServiceReferenceOptionsPanel"/>
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index 857e082c6a..003f9e41fc 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -247,6 +247,10 @@
     <Compile Include="Src\Gui\Dialogs\OpenWithDialog.Designer.cs">
       <DependentUpon>OpenWithDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="Src\Gui\Dialogs\OptionPanels\ExternalToolPanelXaml.xaml.cs">
+      <DependentUpon>ExternalToolPanelXaml.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\CodeGenerationPanel.xaml.cs">
       <DependentUpon>CodeGenerationPanel.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -930,6 +934,7 @@
     <Page Include="Src\Editor\CodeCompletion\CodeCompletionPanelXaml.xaml" />
     <Page Include="Src\Gui\Components\StringListEditorDialog.xaml" />
     <Page Include="Src\Gui\Components\StringListEditorXaml.xaml" />
+    <Page Include="Src\Gui\Dialogs\OptionPanels\ExternalToolPanelXaml.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\CodeGenerationPanel.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\EditStandardHeaderPanel.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\SelectStylePanel.xaml" />
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ExternalToolPanelXaml.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ExternalToolPanelXaml.xaml
new file mode 100644
index 0000000000..c630417aa5
--- /dev/null
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ExternalToolPanelXaml.xaml
@@ -0,0 +1,168 @@
+<gui:OptionPanel x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.ExternalToolPanelXaml"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:core="http://icsharpcode.net/sharpdevelop/core"
+                 xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui"
+                 xmlns:widgets="clr-namespace:ICSharpCode.SharpDevelop.Widgets;assembly=ICSharpCode.SharpDevelop.Widgets">
+	
+	<Grid>
+		<Grid.RowDefinitions>
+			<RowDefinition Height="25" ></RowDefinition>
+			<RowDefinition Height="Auto" ></RowDefinition>
+
+			<RowDefinition Height="15"></RowDefinition>
+			<RowDefinition Height="25"></RowDefinition>
+			<RowDefinition Height="25"></RowDefinition>
+			<RowDefinition Height="25"></RowDefinition>
+			<RowDefinition Height="25"></RowDefinition>
+			<RowDefinition Height="25"></RowDefinition>
+			<RowDefinition Height="25"></RowDefinition>
+		</Grid.RowDefinitions>
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="50" ></ColumnDefinition>
+			<ColumnDefinition Width="140"></ColumnDefinition>
+			<ColumnDefinition Width="*" MinWidth="20"></ColumnDefinition>
+			<ColumnDefinition Width="*" MinWidth="20"></ColumnDefinition>
+			<ColumnDefinition Width="45" ></ColumnDefinition>
+		</Grid.ColumnDefinitions>
+		
+		<Label Grid.ColumnSpan="2" Content="{core:Localize Dialog.Options.ExternalTool.ToolsLabel}"></Label>
+		<Grid  Grid.Row="1" Grid.ColumnSpan="6">
+			<Grid.RowDefinitions>
+				<RowDefinition Height="25"></RowDefinition>
+				<RowDefinition Height="12"></RowDefinition>
+				<RowDefinition Height="25"></RowDefinition>
+				<RowDefinition Height="20"></RowDefinition>
+				<RowDefinition Height="25"></RowDefinition>
+				<RowDefinition Height="12"></RowDefinition>
+				<RowDefinition Height="12" ></RowDefinition>
+				<RowDefinition Height="12"></RowDefinition>
+			
+			</Grid.RowDefinitions>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition></ColumnDefinition>
+				
+				<ColumnDefinition Width="100"></ColumnDefinition>
+			</Grid.ColumnDefinitions>
+			
+			<ListBox x:Name="listBox" Grid.RowSpan="7"
+			         SelectionMode="Multiple"
+			         SelectedItem="{Binding SelectedTool}">
+			</ListBox>
+			
+			<Button x:Name="addButton"  Grid.Column="1" Margin="5,0,5,0"
+			        Style="{x:Static core:GlobalStyles.ButtonStyle}"
+			        Click="AddButton_Click"
+			        Content="{core:Localize Global.AddButtonText}"></Button>
+			
+			<Button x:Name="removeButton" Grid.Row="2" Grid.Column="1" Margin="5,0,5,0"
+			        Style="{x:Static core:GlobalStyles.ButtonStyle}"
+			        IsEnabled="{Binding ButtonsEnable}"
+			        Content="{core:Localize Global.RemoveButtonText}"
+			        Click="RemoveButton_Click"></Button>
+			
+			<Button x:Name="upButton" Grid.Row="4" Grid.Column="1" Margin="5,0,5,0"
+			        Style="{x:Static core:GlobalStyles.ButtonStyle}"
+			        IsEnabled="{Binding ButtonsEnable}"
+			        Content="{core:Localize Global.MoveUp}"
+			        Click="UpButton_Click"></Button>
+			
+			<Button x:Name="downButton" Grid.Row="6" Grid.RowSpan="2" Grid.Column="1" Margin="5,0,5,0"
+			        Style="{x:Static core:GlobalStyles.ButtonStyle}"
+			        IsEnabled="{Binding ButtonsEnable}"
+			        Content="{core:Localize Global.MoveDown}"
+			        Click="DownButton_Click"></Button>
+		</Grid>
+		
+		<Label Grid.Row="3" Grid.Column="1" VerticalAlignment="Center" IsEnabled="{Binding EditEnable}"
+		       Content="{core:Localize Dialog.Options.ExternalTool.TitleLabel}">
+		</Label>
+		
+		<TextBox Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="3" VerticalAlignment="Center"
+		         IsEnabled="{Binding EditEnable}"
+		         Text="{Binding SelectedTool.MenuCommand}">
+		</TextBox>
+		
+		<Label Grid.Row="4" Grid.Column="1" VerticalAlignment="Center" IsEnabled="{Binding EditEnable}"
+		       Content="{core:Localize Dialog.Options.ExternalTool.CommandLabel}">
+		</Label>
+		
+		<TextBox Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2" VerticalAlignment="Center"
+		         IsEnabled="{Binding EditEnable}"
+		         Text="{Binding SelectedTool.Command}">
+		</TextBox>
+		
+		<Button x:Name="browseButton" Grid.Row="4" Grid.Column="4"  Margin="5,0,5,0"
+		        IsEnabled="{Binding EditEnable}"
+		        Content="...">
+		</Button>
+		
+		<Label Grid.Row="5" Grid.Column="1" VerticalAlignment="Center" IsEnabled="{Binding EditEnable}"
+		       Content="{core:Localize Dialog.Options.ExternalTool.ArgumentLabel}">
+		</Label>
+		
+		<TextBox x:Name="argumentTextBox" Grid.Row="5" Grid.Column="2" Grid.ColumnSpan="2" VerticalAlignment="Center"
+		         IsEnabled="{Binding EditEnable}"
+		         Text="{Binding SelectedTool.Arguments}">
+			<TextBox.ContextMenu >
+				<ContextMenu ItemsSource="{Binding ArgumentContextMenu}"
+				             MenuItem.Click="ArgumentTextBoxMenuItem_Click">
+					
+					<ContextMenu.ItemTemplate>
+						<DataTemplate>
+							<MenuItem Header="{Binding Key}"></MenuItem>
+						</DataTemplate>
+					</ContextMenu.ItemTemplate>
+				
+				</ContextMenu>
+			</TextBox.ContextMenu>
+		</TextBox>
+		
+		<Button x:Name="argumentQuickInsertButton" Grid.Row="5" Grid.Column="4"  Margin="5,0,5,0"
+		        IsEnabled="{Binding EditEnable}"
+		        Content="&gt;"
+		        Click="ArgumentQuickInsertButton_Click">
+		</Button>
+		
+		
+		<Label Grid.Row="6" Grid.Column="1" VerticalAlignment="Center" IsEnabled="{Binding EditEnable}"
+		       Content="{core:Localize Dialog.Options.ExternalTool.WorkingDirLabel}">
+		</Label>
+		
+		<TextBox x:Name="workingDirTextBox" Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="2" VerticalAlignment="Center"
+		         IsEnabled="{Binding EditEnable}"
+		         Text="{Binding SelectedTool.InitialDirectory}">
+		<TextBox.ContextMenu >
+				<ContextMenu ItemsSource="{Binding WorkingDirContextMenu}"
+				             MenuItem.Click="WorkingDirTextBoxMenuItem_Click">
+					
+					<ContextMenu.ItemTemplate>
+						<DataTemplate>
+							<MenuItem Header="{Binding Key}"></MenuItem>
+						</DataTemplate>
+					</ContextMenu.ItemTemplate>
+				
+				</ContextMenu>
+			</TextBox.ContextMenu>
+		</TextBox>
+		
+		<Button x:Name="workingDirQuickInsertButton" Grid.Row="6" Grid.Column="4"  Margin="5,0,5,0"
+		        IsEnabled="{Binding EditEnable}"
+		        Click="WorkingDirQuickInsertButton_Click"
+		        Content="&gt;">
+		</Button>
+		
+		<CheckBox x:Name="promptArgsCheckBox" Grid.Row="7" Grid.ColumnSpan="3" VerticalAlignment="Center"
+		          IsEnabled="{Binding EditEnable}"
+		          Content="{core:Localize Dialog.Options.ExternalTool.PromptForArgsCheckBox}"
+		          IsChecked="{Binding SelectedTool.PromptForArguments}">
+		</CheckBox>
+		
+		<CheckBox x:Name="useOutputPadCheckBox" Grid.Row="8" Grid.ColumnSpan="3" VerticalAlignment="Center"
+		          IsEnabled="{Binding EditEnable}"
+		          Content="{core:Localize Dialog.Options.ExternalTool.UseOutputWindow}"
+		          IsChecked="{Binding SelectedTool.UseOutputPad}">
+		</CheckBox>
+	</Grid>
+
+</gui:OptionPanel>
\ No newline at end of file