diff --git a/ILSpy/Bookmarks/BookmarkContextMenuEntry.cs b/ILSpy/AvalonEdit/IconMarginActionsProvider.cs
similarity index 95%
rename from ILSpy/Bookmarks/BookmarkContextMenuEntry.cs
rename to ILSpy/AvalonEdit/IconMarginActionsProvider.cs
index e47c4f68e..3a7cb9796 100644
--- a/ILSpy/Bookmarks/BookmarkContextMenuEntry.cs
+++ b/ILSpy/AvalonEdit/IconMarginActionsProvider.cs
@@ -23,9 +23,9 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 
-using ICSharpCode.ILSpy.AvalonEdit;
+using ICSharpCode.ILSpy.Bookmarks;
 
-namespace ICSharpCode.ILSpy.Bookmarks
+namespace ICSharpCode.ILSpy.AvalonEdit
 {
 	#region Context menu extensibility
 	public interface IBookmarkContextMenuEntry
@@ -92,14 +92,14 @@ namespace ICSharpCode.ILSpy.Bookmarks
 	
 	#endregion
 	
-	internal class BookmarkContextMenuProvider
+	internal class IconMarginActionsProvider
 	{
 		/// <summary>
 		/// Enables extensible context menu support for the specified tree view.
 		/// </summary>
 		public static void Add(IconBarMargin margin)
 		{
-			var provider = new BookmarkContextMenuProvider(margin);
+			var provider = new IconMarginActionsProvider(margin);
 			margin.MouseDown += provider.MouseDown;
 			margin.ContextMenu = new ContextMenu();
 		}
@@ -112,7 +112,7 @@ namespace ICSharpCode.ILSpy.Bookmarks
 		[ImportMany(typeof(IBookmarkActionEntry))]
 		Lazy<IBookmarkActionEntry, IBookmarkActionMetadata>[] actionEntries = null;
 		
-		private BookmarkContextMenuProvider(IconBarMargin margin)
+		private IconMarginActionsProvider(IconBarMargin margin)
 		{
 			this.margin = margin;
 			App.CompositionContainer.ComposeParts(this);
diff --git a/ILSpy/Bookmarks/Commands.cs b/ILSpy/Bookmarks/Commands.cs
index 40d71eef0..2e5dbd8b3 100644
--- a/ILSpy/Bookmarks/Commands.cs
+++ b/ILSpy/Bookmarks/Commands.cs
@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using ICSharpCode.ILSpy.AvalonEdit;
 using ICSharpCode.ILSpy.TreeNodes.Analyzer;
 using Mono.Cecil;
 
diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
index 7579f9c05..460ca4c90 100644
--- a/ILSpy/ILSpy.csproj
+++ b/ILSpy/ILSpy.csproj
@@ -95,12 +95,12 @@
     <Compile Include="AssemblyListManager.cs" />
     <Compile Include="AvalonEdit\IconBarManager.cs" />
     <Compile Include="AvalonEdit\IconBarMargin.cs" />
+    <Compile Include="AvalonEdit\IconMarginActionsProvider.cs" />
     <Compile Include="AvalonEdit\TextMarkerService.cs" />
     <Compile Include="AvalonEdit\TextEditorWeakEventManager.cs" />
     <Compile Include="AvalonEdit\ITextMarker.cs" />
     <Compile Include="BamlDecompiler.cs" />
     <Compile Include="Bookmarks\BookmarkBase.cs" />
-    <Compile Include="Bookmarks\BookmarkContextMenuEntry.cs" />
     <Compile Include="Bookmarks\BookmarkEventHandler.cs" />
     <Compile Include="Bookmarks\BookmarkManager.cs" />
     <Compile Include="Bookmarks\Commands.cs" />
diff --git a/ILSpy/TextView/DecompilerTextView.cs b/ILSpy/TextView/DecompilerTextView.cs
index 66028707d..85122e786 100644
--- a/ILSpy/TextView/DecompilerTextView.cs
+++ b/ILSpy/TextView/DecompilerTextView.cs
@@ -104,7 +104,7 @@ namespace ICSharpCode.ILSpy.TextView
 			textEditor.TextArea.TextView.VisualLinesChanged += delegate { iconMargin.InvalidateVisual(); };
 			
 			// Bookmarks context menu
-			BookmarkContextMenuProvider.Add(iconMargin);
+			IconMarginActionsProvider.Add(iconMargin);
 		}
 		#endregion