diff --git a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/DebuggerTooltipControl.xaml b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/DebuggerTooltipControl.xaml
index ad6bac6820..f9af4fca25 100644
--- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/DebuggerTooltipControl.xaml
+++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/DebuggerTooltipControl.xaml
@@ -113,12 +113,12 @@
                 <DataGrid.Background>
                 	  
                 	  <!-- Control backgound -->
-                    <LinearGradientBrush StartPoint="0,-0.03" EndPoint="0,1">
-                            <GradientStop Color="White"/>
-                            <GradientStop Color="#FFFAFCFE" Offset="0.983"/>
-                            <GradientStop Color="#FFECF7FC" Offset="0.07"/>
-                            <GradientStop Color="#FFEEF7FA" Offset="0.436"/>
-                        </LinearGradientBrush>
+                	<LinearGradientBrush StartPoint="0,-0.03" EndPoint="0,1">
+                		<GradientStop Color="White"/>
+                		<GradientStop Color="#FFFAFCFE" Offset="0.983"/>
+                		<GradientStop Color="#FFECF7FC" Offset="0.07"/>
+                		<GradientStop Color="#FFEEF7FA" Offset="0.436"/>
+                	</LinearGradientBrush>
                 </DataGrid.Background>
                 <DataGrid.RowStyle>
                     <Style TargetType="{x:Type DataGridRow}">
diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsControl.xaml b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsControl.xaml
index 83eace600e..f58775e513 100644
--- a/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsControl.xaml
+++ b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsControl.xaml
@@ -3,9 +3,13 @@
 	x:Class="ICSharpCode.SharpDevelop.Refactoring.ContextActionsControl"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
->
+	xmlns:s="clr-namespace:System;assembly=mscorlib"
+	xmlns:aero="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
 	
 	<UserControl.Resources>
+		<SolidColorBrush x:Key="OuterBorderBrush" Color="#436C82"></SolidColorBrush>
+		<BitmapImage x:Key="Magnifier" UriSource="magnifier.png" />
+		
 		<Style x:Key="ClearButton" TargetType="Button">
 			<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>	<!-- Disable the dashed focus rectangle -->
 			<Setter Property="Template">
@@ -14,22 +18,31 @@
 							To be able to associate actions with TreeViewItems, we use Buttons as content of TreeViewItems. -->
 					<ControlTemplate TargetType="Button">
 						<Border Name="Border"
-						        Padding="4"
+						        Padding="2"
+						        BorderThickness="1"
+						        CornerRadius="1"
+						        BorderBrush="Transparent"
 						        Background="Transparent">
 							<ContentPresenter></ContentPresenter>
 						</Border>
 						<ControlTemplate.Triggers>
-							<Trigger Property="IsFocused" Value="True">
-								<Setter Property="Background" TargetName="Border" Value="LightBlue">
-									<!--<Setter.Value>
-										<DynamicResource ResourceKey="{x:Static SystemColors.HighlightTextBrushKey}" />
-									</Setter.Value>-->
+							<Trigger Property="IsMouseOver" Value="True">
+								<Setter Property="Background" TargetName="Border" Value="#E8F2FF">
 								</Setter>
-								<Setter Property="TextElement.Foreground">
+							</Trigger>
+							<Trigger Property="IsFocused" Value="True">
+								<Setter Property="Background" TargetName="Border">
 									<Setter.Value>
-										<DynamicResource ResourceKey="{x:Static SystemColors.HighlightTextBrushKey}" />
+										<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+											<GradientStop Color="#E5F1FF" Offset="0"/>
+											<GradientStop Color="#D6E9FF" Offset="0.5"/>
+										</LinearGradientBrush>
 									</Setter.Value>
+									<!--<Setter.Value #A3CEFF darker>
+										<DynamicResource ResourceKey="{x:Static SystemColors.HighlightTextBrushKey}" />
+									</Setter.Value>-->
 								</Setter>
+								<Setter Property="BorderBrush" TargetName="Border" Value="#4F7AA8" />
 							</Trigger>
 						</ControlTemplate.Triggers>
 					</ControlTemplate>
@@ -38,7 +51,7 @@
 		</Style>
 	</UserControl.Resources>
 	
-	<Grid Background="White">
+	<Grid Background="Transparent">
 		<Grid.RowDefinitions>
 			<RowDefinition></RowDefinition>
 			<RowDefinition></RowDefinition>
@@ -46,27 +59,48 @@
 		<Grid.ColumnDefinitions>
 			<ColumnDefinition></ColumnDefinition>
 		</Grid.ColumnDefinitions>
-		<Border Grid.Row="0" Grid.Column="0" BorderThickness="1" BorderBrush="Black" HorizontalAlignment="Left">
+		
+		<!-- Header -->
+		<Border Grid.Row="0" Grid.Column="0" Padding="4" BorderThickness="1 1 1 0" 
+		        BorderBrush="{StaticResource OuterBorderBrush}" HorizontalAlignment="Left">
+			<Border.Background>
+				<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+					<GradientStop Color="#D6E9FF" Offset="0"/>
+					<GradientStop Color="#A3CEFF" Offset="0.5"/>
+				</LinearGradientBrush>
+			</Border.Background>
 			<StackPanel Orientation="Horizontal">
 				<Image Source="{Binding Image}"></Image>
 				<TextBlock Text="{Binding Title}"></TextBlock>
 			</StackPanel>
 		</Border>
-		<Border Grid.Row="1" Grid.Column="0" BorderThickness="1" BorderBrush="Black" HorizontalAlignment="Stretch">
+		
+		<!-- Content - TreeView -->
+		<Border Grid.Row="1" Grid.Column="0" Padding="0 0 8 8">
+		<aero:SystemDropShadowChrome>
+		<Border BorderThickness="1" BorderBrush="{StaticResource OuterBorderBrush}" HorizontalAlignment="Stretch">
 			<TreeView ItemsSource="{Binding Actions}" x:Name="TreeView">
+				<TreeView.Background>
+					<LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
+						<GradientStop Color="White"/>
+					</LinearGradientBrush>
+				</TreeView.Background>
 				<TreeView.ItemContainerStyle>
 					<Style TargetType="{x:Type TreeViewItem}">
 						<Setter Property="Template">
 							<Setter.Value>
 								<ControlTemplate TargetType="TreeViewItem">
 									<StackPanel>
+										<!-- ActionButtonClick is used just to close the Popup -->
 										<Button Command="{Binding ActionCommand}" Style="{StaticResource ClearButton}" Click="ActionButtonClick">
 											<Border SnapsToDevicePixels="True">
 												<ContentPresenter Content="{TemplateBinding HeaderedContentControl.Header}" ContentTemplate="{TemplateBinding HeaderedContentControl.HeaderTemplate}" ContentStringFormat="{TemplateBinding HeaderedItemsControl.HeaderStringFormat}" ContentSource="Header" Name="PART_Header"
 													HorizontalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
 											</Border>
 										</Button>
-										<ItemsPresenter Name="ItemsHost" Margin="14 0 0 0" />
+										<Border Padding="14 0 0 0">
+											<ItemsPresenter Name="ItemsHost"  />
+										</Border>
 									</StackPanel>
 									<ControlTemplate.Triggers>
 										<!-- Disable collapsing -->
@@ -86,14 +120,14 @@
 						</Setter>
 						<!-- Make all items expanded -->
 						<Setter Property="IsExpanded" Value="True"></Setter>
-						<!-- Make items not focusable so that contained button gets focus on Down arrow, not the item -->
+						<!-- Make items not focusable so that contained button (not the TreeViewItem) gets focus on Down arrow -->
 						<Setter Property="Focusable" Value="False"></Setter>
-						<!--<EventSetter Event="GotFocus" Handler="GotFocusHandler"></EventSetter>-->
 					</Style>
 				</TreeView.ItemContainerStyle>
 				<TreeView.ItemTemplate>
 					<HierarchicalDataTemplate ItemsSource="{Binding ChildActions}">
 						<DockPanel HorizontalAlignment="Stretch">
+							<Image Source="{Binding Image}" Margin="3 2 4 2" />
 							<TextBlock Text="{Binding Name}" Margin="0 2 20 2" />
 							<TextBlock Text="{Binding Comment}" Foreground="Gray" TextAlignment="Right" HorizontalAlignment="Right"/>
 						</DockPanel>
@@ -101,5 +135,7 @@
 				</TreeView.ItemTemplate>
 			</TreeView>
 		</Border>
+		</aero:SystemDropShadowChrome>
+		</Border>
 	</Grid>
 </UserControl>
\ No newline at end of file
diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsPopup.cs b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsPopup.cs
index b79da31965..6d9f3b0297 100644
--- a/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsPopup.cs
+++ b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsPopup.cs
@@ -17,7 +17,9 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 	{
 		public ContextActionsPopup()
 		{
-			this.StaysOpen = false;	// Close on lost focus
+			this.StaysOpen = false;
+			// Close on lost focus
+			this.AllowsTransparency = true;
 			this.ActionsControl = new ContextActionsControl();
 			// Close when any action excecuted
 			this.ActionsControl.ActionExecuted += delegate { this.Close(); };
diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/ContextActionsHelper.cs b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActionsHelper.cs
index 89bdb42547..80938d47c8 100644
--- a/src/Main/Base/Project/Src/Services/RefactoringService/ContextActionsHelper.cs
+++ b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActionsHelper.cs
@@ -47,7 +47,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 		{
 			var derivedClassesTree = RefactoringService.FindDerivedClassesTree(member.DeclaringType);
 			var popupViewModel = new ContextActionsViewModel { Title = MenuService.ConvertLabel(StringParser.Parse(
-				"${res:SharpDevelop.Refactoring.OverridesOf}", new string[,] {{ "Name", member.Name }}))};
+				"${res:SharpDevelop.Refactoring.OverridesOf}", new string[,] {{ "Name", member.FullyQualifiedName }}))};
 			popupViewModel.Actions = new OverridesPopupTreeViewModelBuilder(member).BuildTreeViewModel(derivedClassesTree);
 			return new ContextActionsPopup { Actions = popupViewModel };
 		}
@@ -66,6 +66,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 			{
 				return new ContextActionViewModel {
 					Name = this.LabelAmbience.Convert(@class),
+					Image = ClassBrowserIconService.GetIcon(@class).ImageSource,
 					Comment = string.Format("(in {0})", @class.Namespace),
 					Action = new GoToClassAction(@class),
 					ChildActions = childActions
@@ -103,15 +104,16 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 				this.member = member;
 			}
 			
-			protected ContextActionViewModel MakeGoToMemberAction(IClass @class, ObservableCollection<ContextActionViewModel> childActions)
+			protected ContextActionViewModel MakeGoToMemberAction(IClass containingClass, ObservableCollection<ContextActionViewModel> childActions)
 			{
-				var overridenMember = MemberLookupHelper.FindSimilarMember(@class, this.member);
+				var overridenMember = MemberLookupHelper.FindSimilarMember(containingClass, this.member);
 				if (overridenMember == null || overridenMember.Region.IsEmpty)
 					return null;
 				
 				return new ContextActionViewModel {
 					Name = this.LabelAmbience.Convert(overridenMember),
-					Comment = string.Format("(in {0})", @class.FullyQualifiedName),
+					Image = ClassBrowserIconService.GetIcon(overridenMember).ImageSource,
+					Comment = string.Format("(in {0})", containingClass.FullyQualifiedName),
 					Action = new GoToMemberAction(overridenMember),
 					ChildActions = childActions
 				};
diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs b/src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs
index 1172a26c22..ff69a651fc 100644
--- a/src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs
+++ b/src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs
@@ -203,7 +203,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 		{
 			if (@class == null)
 				return null;
-			var item = new MenuItem { Header = MenuService.ConvertLabel("Go to base class..") };
+			var item = new MenuItem { Header = MenuService.ConvertLabel("Find base classes..") };
 			item.Icon = ClassBrowserIconService.Interface.CreateImage();
 			item.InputGestureText = new KeyGesture(Key.F10).GetDisplayStringForCulture(Thread.CurrentThread.CurrentUICulture);
 			item.Click += delegate {
@@ -216,7 +216,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 		{
 			if (member == null)
 				return null;
-			var item = new MenuItem { Header = MenuService.ConvertLabel(StringParser.Parse("${res:SharpDevelop.Refactoring.OverridesOf}", new string[,] {{ "Name", member.Name }})) };
+			var item = new MenuItem { Header = MenuService.ConvertLabel(StringParser.Parse("${res:SharpDevelop.Refactoring.FindOverridesCommand}")) };
 			item.Icon = ClassBrowserIconService.Method.CreateImage();
 			item.InputGestureText = new KeyGesture(Key.F11).GetDisplayStringForCulture(Thread.CurrentThread.CurrentUICulture);
 			item.Click += delegate {