diff --git a/data/resources/StringResources.resx b/data/resources/StringResources.resx
index 90e7f09354..cc51602506 100644
--- a/data/resources/StringResources.resx
+++ b/data/resources/StringResources.resx
@@ -6381,6 +6381,17 @@ Removed the end part of the original message ", reason '${Message}'" since this
     <value>Delete all web references</value>
     <comment>Title of the dialog box when the user tries to remove all web references.</comment>
   </data>
+  <data name="ReflectorAddIn.IdeOptions.FindReflectorPath" xml:space="preserve">
+    <value>Select Reflector path</value>
+    <comment>Button to select the Reflector path</comment>
+  </data>
+  <data name="ReflectorAddIn.IdeOptions.ReflectorFoundInPath" xml:space="preserve">
+    <value>Reflector was found in the following directory:</value>
+  </data>
+  <data name="ReflectorAddIn.IdeOptions.ReflectorTitle" xml:space="preserve">
+    <value>Reflector</value>
+    <comment>Title of Reflector path option panel</comment>
+  </data>
   <data name="ReflectorAddIn.OpenReflectorCommand" xml:space="preserve">
     <value>Open .NET Reflector</value>
   </data>
@@ -6390,9 +6401,6 @@ Removed the end part of the original message ", reason '${Message}'" since this
   <data name="ReflectorAddIn.ReflectorPathNotSet" xml:space="preserve">
     <value>The path to Reflector has not been set yet.</value>
   </data>
-  <data name="ReflectorAddIn.ReflectorChangePath" xml:space="preserve">
-    <value>Change Reflector path.</value>
-  </data>
   <data name="ReflectorAddIn.ReflectorRemotingFailed" xml:space="preserve">
     <value>Failed to connect to Reflector.</value>
   </data>
@@ -6405,17 +6413,6 @@ Removed the end part of the original message ", reason '${Message}'" since this
   <data name="ReflectorAddIn.SetReflectorPathDialogTitle" xml:space="preserve">
     <value>Set path to Reflector</value>
   </data>
-  <data name="ReflectorAddIn.IdeOptions.ReflectorFoundInPath" xml:space="preserve">
-    <value>Reflector was found in the following directory:</value>
-  </data>
-  <data name="ReflectorAddIn.IdeOptions.ReflectorTitle" xml:space="preserve">
-    <value>Reflector</value>
-    <comment>Title of Reflector path choosing groupbox</comment>
-  </data>
-  <data name="ReflectorAddIn.IdeOptions.FindReflectorPath" xml:space="preserve">
-    <value>Select Reflector path</value>
-    <comment>Button to select the Reflector path</comment>
-  </data>
   <data name="RegExpTk.MainDialog.Assemblies" xml:space="preserve">
     <value>Assemblies (*.dll)|*.dll</value>
   </data>
diff --git a/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Properties/AssemblyInfo.cs b/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Properties/AssemblyInfo.cs
index b804da8885..830c3cc354 100644
--- a/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Properties/AssemblyInfo.cs
+++ b/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Properties/AssemblyInfo.cs
@@ -21,4 +21,3 @@ using System.Reflection;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: System.CLSCompliant(true)]
diff --git a/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/ReflectorSetupHelper.cs b/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/ReflectorSetupHelper.cs
index 37d6a0a610..e73638f5c0 100644
--- a/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/ReflectorSetupHelper.cs
+++ b/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/ReflectorSetupHelper.cs
@@ -33,6 +33,7 @@ namespace ReflectorAddIn
 			
 			if (askReason != null) {
 				SetReflectorPath dialog = new SetReflectorPath(path, askReason);
+				dialog.Owner = WorkbenchSingleton.MainWindow;
 				bool? result = dialog.ShowDialog();
 				if (!result.HasValue || !result.Value || !File.Exists(dialog.SelectedFile))
 					return null;
@@ -46,9 +47,10 @@ namespace ReflectorAddIn
 		
 		internal static void OpenReflectorExeFullPathInteractiver() {
 			string path = PropertyService.Get(ReflectorExePathPropertyName);
-			string askReason = ResourceService.GetString("ReflectorAddIn.ReflectorChangePath");
+			string askReason = null;
 			
 			SetReflectorPath dialog = new SetReflectorPath(path, askReason);
+			dialog.Owner = WorkbenchSingleton.MainWindow;
 			
 			bool? result = dialog.ShowDialog();
 			if (!result.HasValue || !result.Value || !File.Exists(dialog.SelectedFile))
diff --git a/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/Windows/SetReflectorPath.xaml b/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/Windows/SetReflectorPath.xaml
index ddf5a7635e..90d32042c2 100644
--- a/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/Windows/SetReflectorPath.xaml
+++ b/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/Windows/SetReflectorPath.xaml
@@ -9,7 +9,7 @@
 	ResizeMode="NoResize"
 	WindowStyle="ToolWindow"
 	ShowInTaskbar="False"
-	Height="230"
+	SizeToContent="Height"
 	Width="446">
 	<Window.Resources>
 		<Style
@@ -84,22 +84,23 @@
 						Click="BrowseButton_Click" />
 				</widgets:StackPanelWithSpacing>
 			</GroupBox>
-			<widgets:StackPanelWithSpacing
-				Orientation="Horizontal"
+			<widgets:UniformGridWithSpacing
+				Columns="2"
+				Margin="0,0,12,12"
 				HorizontalAlignment="Right">
 				<Button
 					Name="OkButton"
-					IsDefault="False"
+					IsDefault="True"
 					Content="{core:Localize Global.OKButtonText}"
 					Style="{x:Static core:GlobalStyles.ButtonStyle}"
 					Click="OkButton_Click"/>
 				<Button
 					Name="CancelButton"
-					IsDefault="False"
+					IsCancel="True"
 					Content="{core:Localize Global.CancelButtonText}"
 					Click="CancelButton_Click"
 					Style="{x:Static core:GlobalStyles.ButtonStyle}" />
-			</widgets:StackPanelWithSpacing>
+			</widgets:UniformGridWithSpacing>
 		</widgets:StackPanelWithSpacing>
 	</StackPanel>
 </Window>
\ No newline at end of file
diff --git a/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/Windows/SetReflectorPath.xaml.cs b/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/Windows/SetReflectorPath.xaml.cs
index 4407d5b827..085edf219a 100644
--- a/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/Windows/SetReflectorPath.xaml.cs
+++ b/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/Windows/SetReflectorPath.xaml.cs
@@ -22,7 +22,10 @@ namespace ReflectorAddIn.Windows
 			
 			this.Title = ResourceService.GetString("ReflectorAddIn.SetReflectorPathDialogTitle");
 			
-			this.txtReason.Text = reason;
+			if (reason != null)
+				this.txtReason.Text = reason;
+			else
+				this.txtReason.Visibility = Visibility.Collapsed;
 			if (!String.IsNullOrEmpty(oldPath)) {
 				this.slePath.Text = oldPath;
 			}