diff --git a/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanelXaml.xaml b/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanelXaml.xaml
index ecd0dd223a..a96d97aef5 100644
--- a/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanelXaml.xaml
+++ b/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanelXaml.xaml
@@ -31,7 +31,7 @@
 			          IsChecked="{Binding RunCodeAnalysis.Value}"
 			          Content="{core:Localize ICSharpCode.CodeAnalysis.ProjectOptions.RunOnBuild}"></CheckBox>
 		
-			<Button Grid.Row="1" VerticalAlignment="Center" Grid.ColumnSpan="2" Margin="0,3,0,3"
+			<Button Grid.Row="1" VerticalAlignment="Center" Grid.ColumnSpan="2" Margin="0,10,0,10"
 			        Style="{x:Static core:GlobalStyles.ButtonStyle}"
 			        Click="ChangeRuleAssembliesButtonClick"
 			        Content="{core:Localize ICSharpCode.CodeAnalysis.ProjectOptions.AddRemoveRuleAssembly}"></Button>
diff --git a/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanelXaml.xaml.cs b/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanelXaml.xaml.cs
index 88b6585735..6d17061ffa 100644
--- a/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanelXaml.xaml.cs
+++ b/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanelXaml.xaml.cs
@@ -270,9 +270,28 @@ namespace ICSharpCode.CodeAnalysis
 			return list.ToArray();
 		}
 		
-		private void ChangeRuleAssembliesButtonClick object sender, RoutedEventArgs e)
+		private void ChangeRuleAssembliesButtonClick( object sender, RoutedEventArgs e)
 		{
-	
+			var  stringListDialog = new StringListEditorDialog();
+			stringListDialog.BrowseForDirectory = true;
+			stringListDialog.TitleText = StringParser.Parse("${res:ICSharpCode.CodeAnalysis.ProjectOptions.ChooseRuleAssemblyDirectory}");
+			stringListDialog.LoadList(GetRuleAssemblyList(false));
+			stringListDialog.ShowDialog();
+			if (stringListDialog.DialogResult ?? false) {
+				StringBuilder b = new StringBuilder(DefaultRuleAssemblies);
+				foreach (string asm in stringListDialog.GetList()) {
+					b.Append(';');
+					b.Append(asm);
+				}
+				bool oldInitSuccess = initSuccess;
+				initSuccess = true;
+				try {
+					this.RuleAssemblies = b.ToString();
+				} finally {
+					initSuccess = oldInitSuccess;
+//					base.IsDirty = true;
+				}
+			}
 		}
 		
 	
diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml
index 485b88c9a1..afe5629b7f 100644
--- a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml
+++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml
@@ -22,6 +22,7 @@
 					<RowDefinition Height="Auto"></RowDefinition>
 					<RowDefinition Height="Auto"></RowDefinition>
 				</Grid.RowDefinitions>
+				
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition></ColumnDefinition>
 					<ColumnDefinition Width="Auto"></ColumnDefinition>