diff --git a/ILSpy/TextView/DecompilerTextView.xaml b/ILSpy/TextView/DecompilerTextView.xaml
index 6bd88c9bb..6539eee2d 100644
--- a/ILSpy/TextView/DecompilerTextView.xaml
+++ b/ILSpy/TextView/DecompilerTextView.xaml
@@ -3,12 +3,14 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 			 xmlns:properties="clr-namespace:ICSharpCode.ILSpy.Properties"
              xmlns:ae="clr-namespace:ICSharpCode.AvalonEdit;assembly=ICSharpCode.AvalonEdit"
-             xmlns:folding="clr-namespace:ICSharpCode.AvalonEdit.Folding;assembly=ICSharpCode.AvalonEdit">
+             xmlns:folding="clr-namespace:ICSharpCode.AvalonEdit.Folding;assembly=ICSharpCode.AvalonEdit"
+             xmlns:styles="urn:TomsToolbox.Wpf.Styles">
 	<UserControl.Resources>
 		<BooleanToVisibilityConverter x:Key="boolToVisibility" />
+		<SolidColorBrush x:Key="waitAdornerBackgoundBrush" Color="{DynamicResource {x:Static SystemColors.WindowColorKey}}" Opacity=".75"/>
 	</UserControl.Resources>
 	<Grid>
-		<Border BorderThickness="1,1,0,1" BorderBrush="#FF828790">
+		<Border BorderThickness="1,1,0,1" BorderBrush="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}">
 			<Grid>
 				<ae:TextEditor Name="textEditor" AutomationProperties.Name="Decompilation"  FontFamily="Consolas" FontSize="10pt" IsReadOnly="True"
 				               Background="{DynamicResource {x:Static SystemColors.InfoBrushKey}}"
@@ -20,10 +22,33 @@
 				               >
 					<ae:TextEditor.Resources>
 						<!-- prevent App-wide button style from applying to the buttons in the search box -->
-						<Style TargetType="{x:Type Button}" />
+						<Style TargetType="{x:Type Button}">
+							<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+							<Setter Property="BorderBrush" Value="{DynamicResource {x:Static styles:ResourceKeys.BorderBrush}}" />
+							<Setter Property="HorizontalContentAlignment" Value="Center" />
+							<Setter Property="VerticalContentAlignment" Value="Center" />
+							<Setter Property="Template">
+								<Setter.Value>
+									<ControlTemplate TargetType="Button">
+										<Border BorderThickness="1" 
+										        Background="{TemplateBinding Background}"
+										        BorderBrush="{TemplateBinding BorderBrush}"
+										        Padding="{TemplateBinding Padding}">
+											<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+											                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+										</Border>
+									</ControlTemplate>
+								</Setter.Value>
+							</Setter>
+							<Style.Triggers>
+								<Trigger Property="IsMouseOver" Value="True">
+									<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
+								</Trigger>
+							</Style.Triggers>
+						</Style>
 					</ae:TextEditor.Resources>
 				</ae:TextEditor>
-				<Border Name="waitAdorner" Background="#C0FFFFFF" Visibility="Collapsed">
+				<Border Name="waitAdorner" Background="{StaticResource waitAdornerBackgoundBrush}" Visibility="Collapsed">
 					<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
 						<TextBlock FontSize="14pt" Text="{x:Static properties:Resources.Decompiling}"/>
 						<ProgressBar Name="progressBar" Height="16" Margin="0, 4" />
diff --git a/ILSpy/themes/DarkTheme.xaml b/ILSpy/themes/DarkTheme.xaml
index 786b4e717..f1125651c 100644
--- a/ILSpy/themes/DarkTheme.xaml
+++ b/ILSpy/themes/DarkTheme.xaml
@@ -5,6 +5,30 @@
 	<ResourceDictionary.MergedDictionaries>
 		<ResourceDictionary Source="/AvalonDock.Themes.VS2013;component/darktheme.xaml" />
 	</ResourceDictionary.MergedDictionaries>
+
+	<Color x:Key="{x:Static SystemColors.ControlLightLightColorKey}">#333337</Color>
+	<Color x:Key="{x:Static SystemColors.ControlLightColorKey}">#464646</Color>
+	<Color x:Key="{x:Static SystemColors.ControlColorKey}">#252526</Color>
+	<Color x:Key="{x:Static SystemColors.ControlDarkColorKey}">#686868</Color>
+	<Color x:Key="{x:Static SystemColors.ControlDarkDarkColorKey}">#9E9E9E</Color>
+	<Color x:Key="{x:Static SystemColors.ControlTextColorKey}">#F1F1F1</Color>
+	<Color x:Key="{x:Static SystemColors.GrayTextColorKey}">#999999</Color>
+	<Color x:Key="{x:Static SystemColors.HighlightColorKey}">#3399FF</Color>
+	<Color x:Key="{x:Static SystemColors.HighlightTextColorKey}">#FFFFFF</Color>
+	<Color x:Key="{x:Static SystemColors.InfoTextColorKey}">#F1F1F1</Color>
+	<Color x:Key="{x:Static SystemColors.InfoColorKey}">#333337</Color>
+	<Color x:Key="{x:Static SystemColors.MenuColorKey}">#1B1B1C</Color>
+	<Color x:Key="{x:Static SystemColors.MenuBarColorKey}">#1B1B1C</Color>
+	<Color x:Key="{x:Static SystemColors.MenuTextColorKey}">#F1F1F1</Color>
+	<Color x:Key="{x:Static SystemColors.WindowColorKey}">#333337</Color>
+	<Color x:Key="{x:Static SystemColors.WindowTextColorKey}">#F1F1F1</Color>
+	<Color x:Key="{x:Static SystemColors.ActiveCaptionColorKey}">#2D2D30</Color>
+	<Color x:Key="{x:Static SystemColors.ActiveBorderColorKey}">#007ACC</Color>
+	<Color x:Key="{x:Static SystemColors.ActiveCaptionTextColorKey}">#F1F1F1</Color>
+	<Color x:Key="{x:Static SystemColors.InactiveCaptionColorKey}">#2D2D30</Color>
+	<Color x:Key="{x:Static SystemColors.InactiveBorderColorKey}">#434346</Color>
+	<Color x:Key="{x:Static SystemColors.InactiveCaptionTextColorKey}">#F1F1F1</Color>
+
 	<SolidColorBrush x:Key="{x:Static SystemColors.ControlLightLightBrushKey}" Color="#333337" />
 	<SolidColorBrush x:Key="{x:Static SystemColors.ControlLightBrushKey}" Color="#464646" />
 	<SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}" Color="#252526" />
@@ -27,9 +51,9 @@
 	<SolidColorBrush x:Key="{x:Static SystemColors.InactiveCaptionBrushKey}" Color="#2D2D30" />
 	<SolidColorBrush x:Key="{x:Static SystemColors.InactiveBorderBrushKey}" Color="#434346" />
 	<SolidColorBrush x:Key="{x:Static SystemColors.InactiveCaptionTextBrushKey}" Color="#F1F1F1" />
+
 	<SolidColorBrush x:Key="{x:Static styles:ResourceKeys.BorderBrush}" Color="#3F3F46" />
 	<SolidColorBrush x:Key="{x:Static styles:ResourceKeys.DisabledBrush}" Color="#2D2D30" />
-
 	<Color x:Key="{x:Static themes:ResourceKeys.TextMarkerBackgroundColor}">MediumVioletRed</Color>
 	<SolidColorBrush x:Key="{x:Static themes:ResourceKeys.LinkTextForegroundBrush}">CornflowerBlue</SolidColorBrush>
 
diff --git a/ILSpy/themes/LightTheme.xaml b/ILSpy/themes/LightTheme.xaml
index eff1aad7f..4772cfd78 100644
--- a/ILSpy/themes/LightTheme.xaml
+++ b/ILSpy/themes/LightTheme.xaml
@@ -4,6 +4,28 @@
 	<ResourceDictionary.MergedDictionaries>
 		<ResourceDictionary Source="/AvalonDock.Themes.VS2013;component/lighttheme.xaml" />
 	</ResourceDictionary.MergedDictionaries>
+
+	<Color x:Key="{x:Static SystemColors.ControlLightLightColorKey}">#FCFCFC</Color>
+	<Color x:Key="{x:Static SystemColors.ControlLightColorKey}">#D8D8E0</Color>
+	<Color x:Key="{x:Static SystemColors.ControlColorKey}">#F5F5F5</Color>
+	<Color x:Key="{x:Static SystemColors.ControlDarkColorKey}">#C2C3C9</Color>
+	<Color x:Key="{x:Static SystemColors.ControlDarkDarkColorKey}">#686868</Color>
+	<Color x:Key="{x:Static SystemColors.ControlTextColorKey}">#1E1E1E</Color>
+	<Color x:Key="{x:Static SystemColors.GrayTextColorKey}">#717171</Color>
+	<Color x:Key="{x:Static SystemColors.HighlightColorKey}">#3399FF</Color>
+	<Color x:Key="{x:Static SystemColors.HighlightTextColorKey}">#FFFFFF</Color>
+	<Color x:Key="{x:Static SystemColors.MenuColorKey}">#F6F6F6</Color>
+	<Color x:Key="{x:Static SystemColors.MenuBarColorKey}">#F6F6F6</Color>
+	<Color x:Key="{x:Static SystemColors.MenuTextColorKey}">#1E1E1E</Color>
+	<Color x:Key="{x:Static SystemColors.WindowColorKey}">#FFFFFF</Color>
+	<Color x:Key="{x:Static SystemColors.WindowTextColorKey}">#1E1E1E</Color>
+	<Color x:Key="{x:Static SystemColors.ActiveCaptionColorKey}">#EEEEF2</Color>
+	<Color x:Key="{x:Static SystemColors.ActiveBorderColorKey}">#007ACC</Color>
+	<Color x:Key="{x:Static SystemColors.ActiveCaptionTextColorKey}">#1E1E1E</Color>
+	<Color x:Key="{x:Static SystemColors.InactiveCaptionColorKey}">#EEEEF2</Color>
+	<Color x:Key="{x:Static SystemColors.InactiveBorderColorKey}">#CCCEDB</Color>
+	<Color x:Key="{x:Static SystemColors.InactiveCaptionTextColorKey}">#1E1E1E</Color>
+
 	<SolidColorBrush x:Key="{x:Static SystemColors.ControlLightLightBrushKey}" Color="#FCFCFC" />
 	<SolidColorBrush x:Key="{x:Static SystemColors.ControlLightBrushKey}" Color="#D8D8E0" />
 	<SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}" Color="#F5F5F5" />
@@ -24,6 +46,7 @@
 	<SolidColorBrush x:Key="{x:Static SystemColors.InactiveCaptionBrushKey}" Color="#EEEEF2" />
 	<SolidColorBrush x:Key="{x:Static SystemColors.InactiveBorderBrushKey}" Color="#CCCEDB" />
 	<SolidColorBrush x:Key="{x:Static SystemColors.InactiveCaptionTextBrushKey}" Color="#1E1E1E" />
+
 	<SolidColorBrush x:Key="{x:Static styles:ResourceKeys.BorderBrush}" Color="#CCCEDB" />
 	<SolidColorBrush x:Key="{x:Static styles:ResourceKeys.DisabledBrush}" Color="#EEEEF2" />
 </ResourceDictionary>
\ No newline at end of file