diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs
index fbf2af3dc1..05da508e74 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs
@@ -8,11 +8,11 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Media;
-
 using ICSharpCode.AvalonEdit.Document;
 using ICSharpCode.AvalonEdit.Editing;
 using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.AvalonEdit.Rendering;
+using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Widgets.MyersDiff;
 
@@ -220,11 +220,10 @@ namespace ICSharpCode.AvalonEdit.AddIn
 				}
 				
 				DiffControl differ = new DiffControl();
-				differ.editor.SyntaxHighlighting = editor.SyntaxHighlighting;
+				differ.CopyEditorSettings(editor);
 				differ.editor.HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden;
 				differ.editor.VerticalScrollBarVisibility = ScrollBarVisibility.Hidden;
 				differ.editor.Document.Text = oldText;
-				differ.Background = Brushes.White;
 				
 				if (oldText == string.Empty) {
 					differ.editor.Visibility = Visibility.Collapsed;
@@ -248,7 +247,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
 				
 				tooltip.Child = new Border() {
 					Child = differ,
-					BorderBrush = Brushes.Black,
+					BorderBrush = editor.TextArea.Foreground,
 					BorderThickness = new Thickness(1)
 				};
 				
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml
index b6da3f749d..b0e246c920 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml
@@ -3,7 +3,7 @@
              xmlns:sd="http://icsharpcode.net/sharpdevelop/core"
              xmlns:ae="http://icsharpcode.net/sharpdevelop/avalonedit"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-	<StackPanel Orientation="Vertical">
+	<StackPanel Orientation="Vertical" Background="White">
 		<ToolBar ToolBarTray.IsLocked="True" ToolBar.OverflowMode="Never">
 			<Button x:Name="revertButton"
 				Content="{sd:Localize AddIns.Subversion.Revert}"
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml.cs
index 35b60d4ce3..2e159ff63b 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DiffControl.xaml.cs
@@ -10,8 +10,12 @@ using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
+
+using ICSharpCode.AvalonEdit.AddIn.Options;
+using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.AvalonEdit.Rendering;
 using ICSharpCode.Core.Presentation;
+using ICSharpCode.SharpDevelop;
 
 namespace ICSharpCode.AvalonEdit.AddIn
 {
@@ -39,5 +43,15 @@ namespace ICSharpCode.AvalonEdit.AddIn
 				editor.Copy();
 			}
 		}
+		
+		public void CopyEditorSettings(TextEditor source)
+		{
+			string language = source.SyntaxHighlighting != null ? source.SyntaxHighlighting.Name : null;
+			editor.TextArea.TextView.LineTransformers.RemoveWhere(x => x is HighlightingColorizer);
+			editor.TextArea.TextView.LineTransformers.Insert(0, new CustomizableHighlightingColorizer(source.SyntaxHighlighting.MainRuleSet, CustomizedHighlightingColor.FetchCustomizations(language)));
+			CustomizableHighlightingColorizer.ApplyCustomizationsToDefaultElements(editor, CustomizedHighlightingColor.FetchCustomizations(language));
+			HighlightingOptions.ApplyToRendering(editor, CustomizedHighlightingColor.FetchCustomizations(language));
+			editor.TextArea.TextView.Redraw(); // manually redraw if default elements didn't change but customized highlightings did
+		}
 	}
 }
\ No newline at end of file