diff --git a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/magnifier.png b/data/resources/image/BitmapResources/BitmapResources-data/magnifier.png
similarity index 100%
rename from src/AddIns/Debugger/Debugger.AddIn/Tooltips/magnifier.png
rename to data/resources/image/BitmapResources/BitmapResources-data/magnifier.png
diff --git a/data/resources/image/BitmapResources/BitmapResources.res b/data/resources/image/BitmapResources/BitmapResources.res
index c409431afa..6b1df909cd 100644
--- a/data/resources/image/BitmapResources/BitmapResources.res
+++ b/data/resources/image/BitmapResources/BitmapResources.res
@@ -227,6 +227,7 @@ Icons.16x16.HtmlElements.FieldSetElement          = BitmapResources-data\Icons.1
 Icons.16x16.SplitWindow                           = BitmapResources-data\Icons.16x16.SplitWindow.png
 Icons.16x16.DeleteHistory                         = BitmapResources-data\Icons.16x16.DeleteHistory.png
 Icons.16x16.Refresh                         	  = BitmapResources-data\Icons.16x16.Refresh.png
+Icons.Magnifier									  = BitmapResources-data\magnifier.png
 
 #pad icons
 PadIcons.ErrorList                                = PadIcons\ErrorList.png
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
index 3c2ff28a12..a84df33228 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
+++ b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
@@ -319,7 +319,6 @@
     <Compile Include="Visualizers\PresentationBindings\EnumViewModel.cs" />
     <Compile Include="Visualizers\PresentationBindings\ViewModelBase.cs" />
     <None Include="COPYING" />
-    <None Include="Tooltips\magnifier.png" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Debugger.AddIn.addin">
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/VisualizerPicker.xaml b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/VisualizerPicker.xaml
index 41abaf39d7..19c0fa69d0 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/VisualizerPicker.xaml
+++ b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/VisualizerPicker.xaml
@@ -1,28 +1,26 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
-    xmlns:debugging="clr-namespace:Debugger.AddIn.Tooltips">
-	
-	<BitmapImage x:Key="MagnifierImage" UriSource="magnifier.png" />
-	
-        <Style x:Key="ComboBoxFocusVisual">
-            <Setter Property="Control.Template">
-                <Setter.Value>
-                    <ControlTemplate>
-                        <Rectangle Stroke="Black" StrokeDashArray="1 2" StrokeThickness="1" Margin="4,4,21,4" SnapsToDevicePixels="true"/>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <LinearGradientBrush x:Key="ButtonNormalBackground" EndPoint="0,1" StartPoint="0,0">
-            <GradientStop Color="#F3F3F3" Offset="0"/>
-            <GradientStop Color="#EBEBEB" Offset="0.5"/>
-            <GradientStop Color="#DDDDDD" Offset="0.5"/>
-            <GradientStop Color="#CDCDCD" Offset="1"/>
-        </LinearGradientBrush>
-        <SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF707070"/>
-        <Geometry x:Key="DownArrowGeometry">M 0 0 L 2 3 L 4 0 Z</Geometry>
-        <Style x:Key="ComboBoxReadonlyToggleButton" TargetType="{x:Type ToggleButton}">
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
+	xmlns:debugging="clr-namespace:Debugger.AddIn.Tooltips"
+	xmlns:core="http://icsharpcode.net/sharpdevelop/core">
+	<Style x:Key="ComboBoxFocusVisual">
+		<Setter Property="Control.Template">
+			<Setter.Value>
+				<ControlTemplate>
+					<Rectangle Stroke="Black" StrokeDashArray="1 2" StrokeThickness="1" Margin="4,4,21,4" SnapsToDevicePixels="true"/>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<LinearGradientBrush x:Key="ButtonNormalBackground" EndPoint="0,1" StartPoint="0,0">
+		<GradientStop Color="#F3F3F3" Offset="0"/>
+		<GradientStop Color="#EBEBEB" Offset="0.5"/>
+		<GradientStop Color="#DDDDDD" Offset="0.5"/>
+		<GradientStop Color="#CDCDCD" Offset="1"/>
+	</LinearGradientBrush>
+	<SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF707070"/>
+	<Geometry x:Key="DownArrowGeometry">M 0 0 L 2 3 L 4 0 Z</Geometry>
+	<Style x:Key="ComboBoxReadonlyToggleButton" TargetType="{x:Type ToggleButton}">
 		<Setter Property="OverridesDefaultStyle" Value="true"/>
 		<Setter Property="IsTabStop" Value="false"/>
 		<Setter Property="Focusable" Value="false"/>
@@ -30,7 +28,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ToggleButton}">
-
+					
 					<!-- Button face - changed from original ButtonChrome to Border -->
 					<Border Name="FaceBorder" Background="Transparent" CornerRadius="2" BorderBrush="Transparent" BorderThickness="1" Padding="1" >
 						<Grid>
@@ -38,9 +36,9 @@
 								<ColumnDefinition Width="*"/>
 								<ColumnDefinition  Width="5"/>
 							</Grid.ColumnDefinitions>
-							<!--  
+							<!--
 							<Rectangle Width="10" Height="10" Grid.Column="0" Fill="Black"></Rectangle> -->
-							<Image Grid.Column="0" Width="10" Height="10" Stretch="Fill" Source="{StaticResource MagnifierImage}" />
+							<Image Grid.Column="0" Width="10" Height="10" Stretch="Fill" Source="{core:GetBitmap Icons.Magnifier}" />
 							<Path Grid.Column="1" x:Name="Arrow" Fill="Black" HorizontalAlignment="Center" Margin="0" VerticalAlignment="Center" Data="{StaticResource DownArrowGeometry}"/>
 						</Grid>
 					</Border>
@@ -52,8 +50,8 @@
 						<Trigger Property="IsMouseOver" Value="true">
 							<Setter TargetName="FaceBorder" Property="Background" Value="White"/>
 							<Setter TargetName="FaceBorder" Property="BorderBrush" Value="#FFE0EDFF"/>
-					    <!-- #FFE0EDFF border -->
-						<!--   #FFD9D9E9 fill  -->
+							<!-- #FFE0EDFF border -->
+							<!--   #FFD9D9E9 fill  -->
 						</Trigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
@@ -77,7 +75,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type debugging:VisualizerPicker}">
-
+					
 					<!--  ComboBox face -->
 					<Grid x:Name="MainGrid" SnapsToDevicePixels="true" Width="18" Height="16">
 						<Grid.ColumnDefinitions>
@@ -94,19 +92,19 @@
 							</Microsoft_Windows_Themes:SystemDropShadowChrome>
 						</Popup>
 						<ToggleButton Style="{StaticResource ComboBoxReadonlyToggleButton}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"/>
-
+						
 						<!-- Content of ComboBox face -->
-						<ContentPresenter 
-                                HorizontalAlignment="Left" 
-                                Margin="0" 
-                                VerticalAlignment="Center" 
-                                IsHitTestVisible="false" 
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                                ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" 
-                                Content=" " 
-                                
-                                ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" 
-                                ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"/>
+						<ContentPresenter
+							HorizontalAlignment="Left"
+							Margin="0"
+							VerticalAlignment="Center"
+							IsHitTestVisible="false"
+							SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+							ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
+							Content=" "
+							
+							ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+							ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"/>
 					</Grid>
 					<ControlTemplate.Triggers>
 						<Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="true">
diff --git a/src/Main/StartUp/Project/Resources/BitmapResources.resources b/src/Main/StartUp/Project/Resources/BitmapResources.resources
index 0b467fe1f0..18662dc382 100644
Binary files a/src/Main/StartUp/Project/Resources/BitmapResources.resources and b/src/Main/StartUp/Project/Resources/BitmapResources.resources differ