diff --git a/data/resources/image/BitmapResources/BitmapResources.res b/data/resources/image/BitmapResources/BitmapResources.res
index 0301ff5694..76615e2224 100644
--- a/data/resources/image/BitmapResources/BitmapResources.res
+++ b/data/resources/image/BitmapResources/BitmapResources.res
@@ -29,7 +29,6 @@ ProjectBrowser.MissingSolution        = ProjectBrowserIcons\MissingSolution.png
 ProjectBrowser.Solution               = ProjectBrowserIcons\Solution.png
 ProjectBrowser.Toolbar.Refresh         = ProjectBrowserIcons\Toolbar.Refresh.png
 ProjectBrowser.Toolbar.ShowHiddenFiles = ProjectBrowserIcons\Toolbar.ShowHiddenFiles.png
-ProjectBrowser.Toolbar.Collapse		  = ProjectBrowserIcons\Toolbar.Collapse.png
 ProjectBrowser.SolutionFolder.Closed = ProjectBrowserIcons\SolutionFolder.Closed.png
 ProjectBrowser.SolutionFolder.Open   = ProjectBrowserIcons\SolutionFolder.Open.png
 ProjectBrowser.SolutionFolder.CreateNew   = ProjectBrowserIcons\SolutionFolder.CreateNew.png
diff --git a/data/resources/image/BitmapResources/ProjectBrowserIcons/Toolbar.Collapse.png b/data/resources/image/BitmapResources/ProjectBrowserIcons/Toolbar.Collapse.png
deleted file mode 100644
index 7bbd6e713a..0000000000
Binary files a/data/resources/image/BitmapResources/ProjectBrowserIcons/Toolbar.Collapse.png and /dev/null differ
diff --git a/src/AddIns/Analysis/UnitTesting/UnitTesting.addin b/src/AddIns/Analysis/UnitTesting/UnitTesting.addin
index 2a2f9cc880..a3c79e0dfe 100644
--- a/src/AddIns/Analysis/UnitTesting/UnitTesting.addin
+++ b/src/AddIns/Analysis/UnitTesting/UnitTesting.addin
@@ -131,8 +131,8 @@
 			             class="ICSharpCode.UnitTesting.AddNUnitReferenceCommand"/>
 			<ToolbarItem id = "CollapseSeparator" type = "Separator"/>
 			<ToolbarItem id      = "Collapse"
-			             icon    = "ProjectBrowser.Toolbar.Collapse"
-			             tooltip = "${res:ProjectBrowser.Toolbar.CollapseAll}"
+			             icon    = "Icons.16x16.Assembly"
+			             tooltip = "${res:MainWindow.Windows.SearchResultPanel.CollapseAll.ToolTip}"
 			             class   = "ICSharpCode.UnitTesting.CollapseAllTestsCommand"/>
 		</Condition>
 	</Path>
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index c064e8a3fe..1872dc8fca 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -184,8 +184,8 @@
 			             class   = "ICSharpCode.SharpDevelop.Project.Commands.RefreshProjectBrowser"/>
 			<ToolbarItem id = "PropertySeparator" type = "Separator"/>
 			<ToolbarItem id      = "Collapse"
-			             icon    = "ProjectBrowser.Toolbar.Collapse"
-			             tooltip = "${res:ProjectBrowser.Toolbar.CollapseAll}"
+			             icon    = "Icons.16x16.Assembly"
+			             tooltip = "${res:MainWindow.Windows.SearchResultPanel.CollapseAll.ToolTip}"
 			             class   = "ICSharpCode.SharpDevelop.Project.Commands.CollapseAllProjectBrowser"/>
 		</Condition>
 	</Path>
@@ -775,8 +775,8 @@
 		</ToolbarItem>
 		<ToolbarItem id = "NavigationSeparator" type  = "Separator"/>
 		<ToolbarItem id      = "Collapse"
-		             icon    = "ProjectBrowser.Toolbar.Collapse"
-		             tooltip = "${res:ProjectBrowser.Toolbar.CollapseAll}"
+		             icon    = "Icons.16x16.Assembly"
+		             tooltip = "${res:MainWindow.Windows.SearchResultPanel.CollapseAll.ToolTip}"
 		             class   = "ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserCollapseAll"/>
 	</Path>