diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index 2ee7b8a7e4..32fcf36896 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -364,6 +364,8 @@
     <Compile Include="Src\Services\ProjectBinding\IProjectBinding.cs" />
     <Compile Include="Src\Internal\Templates\Project\ProjectCreateInformation.cs" />
     <Compile Include="Src\Services\ProjectBinding\ProjectBindingService.cs" />
+    <Resource Include="Src\Services\RefactoringService\ContextActions\bulb.png" />
+    <Resource Include="Src\Services\RefactoringService\ContextActions\pencil.png" />
     <Resource Include="Src\Services\Debugger\Tooltips\magnifier.png">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </Resource>
diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsBulbControl.xaml b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsBulbControl.xaml
index 30694a9e3b..8ecba49a41 100644
--- a/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsBulbControl.xaml
+++ b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsBulbControl.xaml
@@ -1,11 +1,13 @@
 <UserControl x:Class="ICSharpCode.SharpDevelop.Refactoring.ContextActionsBulbControl"
-	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="clr-namespace:ICSharpCode.SharpDevelop.Refactoring"
-	xmlns:aero="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:ICSharpCode.SharpDevelop.Refactoring"
+             xmlns:aero="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
 	
 	<UserControl.Resources>
-		<SolidColorBrush x:Key="OuterBorderBrush" Color="#436C82"></SolidColorBrush>
+		<!--<BitmapImage x:Key="BulbImage" UriSource="bulb.png" />-->
+		<BitmapImage x:Key="PencilImage" UriSource="pencil.png" />
+		<Geometry x:Key="DownArrowGeometry">M 0 0 L 2 3 L 4 0 Z</Geometry>
 	</UserControl.Resources>
 	
 	<Grid Background="Transparent">
@@ -18,17 +20,31 @@
 		</Grid.ColumnDefinitions>
 		
 		<!-- Header -->
-		<Border x:Name="Header" Grid.Row="0" Grid.Column="0" Padding="4" BorderThickness="1" 
-		        BorderBrush="{StaticResource OuterBorderBrush}" HorizontalAlignment="Left" MouseUp="Header_MouseUp">
+		<Border x:Name="Header" Grid.Row="0" Grid.Column="0" Padding="2" BorderThickness="1" CornerRadius="2"
+		        BorderBrush="#485763" HorizontalAlignment="Left" MouseUp="Header_MouseUp">
 			<Border.Background>
 				<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-					<GradientStop Color="#D6E9FF" Offset="0"/>
-					<GradientStop Color="#A3CEFF" Offset="0.5"/>
+					<GradientStop Color="#F2F2F2" Offset="0"/>
+					<GradientStop Color="#FFFFFF" Offset="0.2"/>
 				</LinearGradientBrush>
 			</Border.Background>
-			<StackPanel Orientation="Horizontal">
-				<TextBlock Text="###"></TextBlock>
-			</StackPanel>
+			<Grid>
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition />
+				</Grid.ColumnDefinitions>
+				<Image Grid.Column="0" Width="12" Height="12" Stretch="Fill" Source="{StaticResource PencilImage}" />
+<!--				<Path Grid.Column="1" x:Name="Arrow" Fill="Black" Margin="0" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource DownArrowGeometry}"/>-->
+			</Grid>
+			<!--<Border.Style>
+				<Style TargetType="{x:Type Border}">
+					<Style.Triggers>
+						<DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsOpen}" Value="True">
+							<Setter Property="Background" Value="Red"></Setter>
+						</DataTrigger>
+					</Style.Triggers>
+				</Style>
+			</Border.Style>-->
 		</Border>
 		
 		<!-- Content - TreeView -->
diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsBulbControl.xaml.cs b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsBulbControl.xaml.cs
index 174d655fb0..f9401c6d1a 100644
--- a/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsBulbControl.xaml.cs
+++ b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsBulbControl.xaml.cs
@@ -24,6 +24,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 		public ContextActionsBulbControl()
 		{
 			InitializeComponent();
+			this.IsOpen = false;
 		}
 		
 		public event EventHandler ActionExecuted
@@ -37,7 +38,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 			get { return isOpen; }
 			set {
 				isOpen = value;
-				this.Header.Opacity = isOpen ? 1.0 : 0.5;
+				this.Header.Opacity = isOpen ? 1.0 : 1.0;
 				this.Header.BorderThickness = isOpen ? new Thickness(1, 1, 1, 0) : new Thickness(1);
 				this.ActionsTreeView.Visibility = isOpen ? Visibility.Visible : Visibility.Collapsed;
 			}
diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/bulb.png b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/bulb.png
new file mode 100644
index 0000000000..052d9ba85d
Binary files /dev/null and b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/bulb.png differ
diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/pencil.png b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/pencil.png
new file mode 100644
index 0000000000..c60192dfc0
Binary files /dev/null and b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/pencil.png differ