diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml
index bc975787c8..77ca196665 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml
@@ -301,10 +301,11 @@
 				</Grid>
 			</GroupBox>
 			
-			<optionpanels:ErrorsAndWarnings x:Name="errorsAndWarnings">
-			
-			</optionpanels:ErrorsAndWarnings>
-			
+			<GroupBox Margin="0,8,0,0" Header="{core:Localize Dialog.ProjectOptions.Build.ErrorsAndWarnings}">  
+				<optionpanels:ErrorsAndWarnings x:Name="errorsAndWarnings">
+				</optionpanels:ErrorsAndWarnings>
+			</GroupBox>
+		
 		</StackPanel>
 	</ScrollViewer>
 </optionpanels:ProjectOptionPanel>
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml
index 2e21e6c4a1..d2fd6a7c19 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml
@@ -331,10 +331,11 @@
 				</Grid>
 			</GroupBox>
 			
-			<optionpanels:ErrorsAndWarnings x:Name="errorsAndWarnings">
+			<GroupBox Margin="0,8,0,0" Header="{core:Localize Dialog.ProjectOptions.Build.ErrorsAndWarnings}">   
+				<optionpanels:ErrorsAndWarnings x:Name="errorsAndWarnings">
+				</optionpanels:ErrorsAndWarnings>
+			</GroupBox>
 			
-			</optionpanels:ErrorsAndWarnings>
-				
 			<!--<GroupBox Margin="0,8,0,0"
 			          Header="{core:Localize Dialog.ProjectOptions.Build.ErrorsAndWarnings}">
 				<Grid>
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ErrorsAndWarnings.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ErrorsAndWarnings.xaml
new file mode 100644
index 0000000000..bd2267b346
--- /dev/null
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ErrorsAndWarnings.xaml
@@ -0,0 +1,38 @@
+<UserControl x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.ErrorsAndWarnings"
+             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;assembly=ICSharpCode.SharpDevelop"
+             xmlns:core="http://icsharpcode.net/sharpdevelop/core">
+	
+	<Grid>
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="Auto"></ColumnDefinition>
+			<ColumnDefinition Width="Auto"></ColumnDefinition>
+			<ColumnDefinition Width="*"></ColumnDefinition>
+		</Grid.ColumnDefinitions>
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto"></RowDefinition>
+			<RowDefinition Height="Auto"></RowDefinition>
+			<RowDefinition Height="Auto"></RowDefinition>
+		</Grid.RowDefinitions>
+		
+		<optionpanels:StorageLocationPicker Grid.Row="1" Location="{Binding TreatWarningsAsErrors.Location}">
+		</optionpanels:StorageLocationPicker>
+		
+		<RadioButton x:Name="noneRadioButton" Grid.Column="1" VerticalAlignment="Center" Margin="3,0,3,0"
+		             Content="{core:Localize Dialog.ProjectOptions.Build.TreatWarningsAsErrors.None}"></RadioButton>
+		
+		<RadioButton x:Name="specificWarningsRadioButton" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Margin="3,0,3,0"
+		             Content="{core:Localize Dialog.ProjectOptions.Build.TreatWarningsAsErrors.Specific}"></RadioButton>
+		
+		<TextBox x:Name="specificWarningsTextBox" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center"
+		         Margin="3,0,3,0"
+		         IsEnabled="{Binding ElementName=specificWarningsRadioButton, Path=IsChecked}"
+		         Text="{Binding WarningsAsErrors.Value, UpdateSourceTrigger=PropertyChanged}"></TextBox>
+		
+		<RadioButton x:Name="allRadioButton" Grid.Row="2" Grid.Column="1"
+		             Margin="3,0,3,0"
+		             VerticalAlignment="Center"
+		             Content="{core:Localize Dialog.ProjectOptions.Build.TreatWarningsAsErrors.All}"></RadioButton>
+	</Grid>
+</UserControl>
\ No newline at end of file