diff --git a/src/Main/ICSharpCode.Core.Presentation/themes/Aero.NormalColor.xaml b/src/Main/ICSharpCode.Core.Presentation/themes/Aero.NormalColor.xaml
index d7278cf987..a675e83458 100644
--- a/src/Main/ICSharpCode.Core.Presentation/themes/Aero.NormalColor.xaml
+++ b/src/Main/ICSharpCode.Core.Presentation/themes/Aero.NormalColor.xaml
@@ -2,8 +2,7 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:local="clr-namespace:ICSharpCode.Core.Presentation"
 >
-	<!-- TODO: these colors don't get used currently - the StaticResource in generic.xaml doesn't pick them up, and DynamicResource doesn't work at all -->
-	<SolidColorBrush x:Key="DropDownButtonActiveBorder" Color="#FF3399FF"/>
-	<SolidColorBrush x:Key="DropDownButtonActiveBackground" Color="#FFC2E0FF"/>
-	<SolidColorBrush x:Key="SplitButtonPressedBackground" Color="#FF99CCFF"/>
+	<SolidColorBrush x:Key="{ComponentResourceKey {x:Type local:DropDownButton}, ActiveBorder}" Color="#FF3399FF"/>
+	<SolidColorBrush x:Key="{ComponentResourceKey {x:Type local:DropDownButton}, ActiveBackground}" Color="#FFC2E0FF"/>
+	<SolidColorBrush x:Key="{ComponentResourceKey {x:Type local:SplitButton}, PressedBackground}" Color="#FF99CCFF"/>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Main/ICSharpCode.Core.Presentation/themes/generic.xaml b/src/Main/ICSharpCode.Core.Presentation/themes/generic.xaml
index 8bbba69c76..dbc6da7bce 100644
--- a/src/Main/ICSharpCode.Core.Presentation/themes/generic.xaml
+++ b/src/Main/ICSharpCode.Core.Presentation/themes/generic.xaml
@@ -2,9 +2,9 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:local="clr-namespace:ICSharpCode.Core.Presentation"
 >
-	<SolidColorBrush x:Key="DropDownButtonActiveBorder" Color="#FF0A246A"/>
-	<SolidColorBrush x:Key="DropDownButtonActiveBackground" Color="#FFB6BDD2"/>
-	<SolidColorBrush x:Key="SplitButtonPressedBackground" Color="#FF8592B5"/>
+	<SolidColorBrush x:Key="{ComponentResourceKey {x:Type local:DropDownButton}, ActiveBorder}" Color="#FF0A246A"/>
+	<SolidColorBrush x:Key="{ComponentResourceKey {x:Type local:DropDownButton}, ActiveBackground}" Color="#FFB6BDD2"/>
+	<SolidColorBrush x:Key="{ComponentResourceKey {x:Type local:SplitButton}, PressedBackground}" Color="#FF8592B5"/>
 	
 	<Style TargetType="{x:Type local:DropDownButton}">
 		<Setter Property="TextElement.Foreground" Value = "{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
@@ -46,12 +46,12 @@
 					</Border>
 					<ControlTemplate.Triggers>
 						<Trigger Property="UIElement.IsMouseOver" Value="True">
-							<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{StaticResource DropDownButtonActiveBorder}" />
-							<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{DynamicResource DropDownButtonActiveBackground}"/>
+							<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBorder}}" />
+							<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBackground}}"/>
 						</Trigger>
 						<Trigger Property="UIElement.IsKeyboardFocused" Value="True">
-							<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{StaticResource DropDownButtonActiveBorder}"/>
-							<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{StaticResource DropDownButtonActiveBackground}"/>
+							<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBorder}}"/>
+							<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBackground}}"/>
 						</Trigger>
 						<Trigger Property="UIElement.IsEnabled" Value="False">
 							<Setter Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
@@ -115,18 +115,18 @@
 					</Border>
 					<ControlTemplate.Triggers>
 						<Trigger Property="UIElement.IsMouseOver" Value="True">
-							<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{StaticResource DropDownButtonActiveBorder}" />
-							<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{StaticResource DropDownButtonActiveBackground}"/>
-							<Setter Property="Panel.Background" TargetName="PART_DropDownArrow" Value="{StaticResource DropDownButtonActiveBackground}"/>
+							<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBorder}}" />
+							<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBackground}}"/>
+							<Setter Property="Panel.Background" TargetName="PART_DropDownArrow" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBackground}}"/>
 						</Trigger>
 						<Trigger Property="UIElement.IsKeyboardFocused" Value="True">
-							<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{StaticResource DropDownButtonActiveBorder}" />
-							<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{StaticResource DropDownButtonActiveBackground}"/>
-							<Setter Property="Panel.Background" TargetName="PART_DropDownArrow" Value="{StaticResource DropDownButtonActiveBackground}"/>
+							<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBorder}}" />
+							<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBackground}}"/>
+							<Setter Property="Panel.Background" TargetName="PART_DropDownArrow" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBackground}}"/>
 						</Trigger>
 						<Trigger Property="ButtonBase.IsPressed" Value="True">
-							<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{StaticResource DropDownButtonActiveBorder}" />
-							<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{StaticResource SplitButtonPressedBackground}"/>
+							<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBorder}}" />
+							<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:SplitButton}, PressedBackground}}"/>
 						</Trigger>
 						<Trigger Property="UIElement.IsEnabled" Value="False">
 							<Setter Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>