diff --git a/platform/icons/src/_cvs/checkOut.png b/platform/icons/src/_cvs/checkOut.png
deleted file mode 100644
index 0deafaa170fd..000000000000
Binary files a/platform/icons/src/_cvs/checkOut.png and /dev/null differ
diff --git a/platform/icons/src/_cvs/cvs.png b/platform/icons/src/_cvs/cvs.png
deleted file mode 100644
index f46a91236a9b..000000000000
Binary files a/platform/icons/src/_cvs/cvs.png and /dev/null differ
diff --git a/platform/icons/src/_cvs/hideMissing.png b/platform/icons/src/_cvs/hideMissing.png
deleted file mode 100644
index 97b1a5b86b49..000000000000
Binary files a/platform/icons/src/_cvs/hideMissing.png and /dev/null differ
diff --git a/platform/icons/src/_cvs/hideUnknown.png b/platform/icons/src/_cvs/hideUnknown.png
deleted file mode 100644
index ae5728e8192f..000000000000
Binary files a/platform/icons/src/_cvs/hideUnknown.png and /dev/null differ
diff --git a/platform/icons/src/_cvs/hideUptodate.png b/platform/icons/src/_cvs/hideUptodate.png
deleted file mode 100644
index 35812474337a..000000000000
Binary files a/platform/icons/src/_cvs/hideUptodate.png and /dev/null differ
diff --git a/platform/icons/src/_cvs/missing.png b/platform/icons/src/_cvs/missing.png
deleted file mode 100644
index be638c26242d..000000000000
Binary files a/platform/icons/src/_cvs/missing.png and /dev/null differ
diff --git a/platform/icons/src/_cvs/testInProgress1.png b/platform/icons/src/_cvs/testInProgress1.png
deleted file mode 100644
index c50631693d2e..000000000000
Binary files a/platform/icons/src/_cvs/testInProgress1.png and /dev/null differ
diff --git a/platform/icons/src/_cvs/testInProgress2.png b/platform/icons/src/_cvs/testInProgress2.png
deleted file mode 100644
index 7d9b0d03fd7b..000000000000
Binary files a/platform/icons/src/_cvs/testInProgress2.png and /dev/null differ
diff --git a/platform/icons/src/_cvs/testInProgress3.png b/platform/icons/src/_cvs/testInProgress3.png
deleted file mode 100644
index 167811a22d90..000000000000
Binary files a/platform/icons/src/_cvs/testInProgress3.png and /dev/null differ
diff --git a/platform/icons/src/_cvs/testInProgress4.png b/platform/icons/src/_cvs/testInProgress4.png
deleted file mode 100644
index fec75adf8144..000000000000
Binary files a/platform/icons/src/_cvs/testInProgress4.png and /dev/null differ
diff --git a/platform/icons/src/_cvs/testInProgress5.png b/platform/icons/src/_cvs/testInProgress5.png
deleted file mode 100644
index 5a5811ff77dd..000000000000
Binary files a/platform/icons/src/_cvs/testInProgress5.png and /dev/null differ
diff --git a/platform/icons/src/_cvs/testInProgress6.png b/platform/icons/src/_cvs/testInProgress6.png
deleted file mode 100644
index dddc98f7eac8..000000000000
Binary files a/platform/icons/src/_cvs/testInProgress6.png and /dev/null differ
diff --git a/platform/icons/src/_cvs/testInProgress7.png b/platform/icons/src/_cvs/testInProgress7.png
deleted file mode 100644
index 5b1835a5e1b8..000000000000
Binary files a/platform/icons/src/_cvs/testInProgress7.png and /dev/null differ
diff --git a/platform/icons/src/_cvs/testInProgress8.png b/platform/icons/src/_cvs/testInProgress8.png
deleted file mode 100644
index bfc1339045f9..000000000000
Binary files a/platform/icons/src/_cvs/testInProgress8.png and /dev/null differ
diff --git a/platform/icons/src/_cvs/unknown.png b/platform/icons/src/_cvs/unknown.png
deleted file mode 100644
index c3db35b2d4d5..000000000000
Binary files a/platform/icons/src/_cvs/unknown.png and /dev/null differ
diff --git a/platform/icons/src/_cvs/showAsTree.png b/platform/icons/src/actions/showAsTree.png
similarity index 100%
rename from platform/icons/src/_cvs/showAsTree.png
rename to platform/icons/src/actions/showAsTree.png
diff --git a/platform/platform-resources/platform-resources.iml b/platform/platform-resources/platform-resources.iml
index b02a4aad9114..dcae9c1f00d4 100644
--- a/platform/platform-resources/platform-resources.iml
+++ b/platform/platform-resources/platform-resources.iml
@@ -8,6 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="lvcs-impl" exported="" scope="RUNTIME" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
 
diff --git a/platform/platform-resources/src/idea/VcsActions.xml b/platform/platform-resources/src/idea/VcsActions.xml
index 91f17d8d3798..0070165c10b3 100644
--- a/platform/platform-resources/src/idea/VcsActions.xml
+++ b/platform/platform-resources/src/idea/VcsActions.xml
@@ -1,7 +1,7 @@
 <component>
   <actions>
     <action id="Vcs.ShowTabbedFileHistory" class="com.intellij.openapi.vcs.actions.TabbedShowHistoryAction"
-      icon="AllIcons._cvs.ShowAsTree"/>
+      icon="AllIcons.Actions.ShowAsTree"/>
 
     <action id="CheckinProject" class="com.intellij.openapi.vcs.actions.CommonCheckinProjectAction" icon="AllIcons.Actions.Commit">
       <keyboard-shortcut first-keystroke="control K" keymap="$default"/>
@@ -48,7 +48,7 @@
                 text = "VCS Operations Popup..." description="Context aware popup with list of commonly used VCS actions"/>
         <action id="Vcs.ChangesView" class="com.intellij.openapi.vcs.changes.ShowChangesViewAction"/>
         <reference ref="CheckinProject"/>
-        <action id="Vcs.UpdateProject" class="com.intellij.openapi.vcs.update.CommonUpdateProjectAction" icon="AllIcons._cvs.CheckOut">
+        <action id="Vcs.UpdateProject" class="com.intellij.openapi.vcs.update.CommonUpdateProjectAction" icon="AllIcons.Actions.CheckOut">
           <keyboard-shortcut first-keystroke="control T" keymap="$default"/>
         </action>
         <action id="Vcs.IntegrateProject" class="com.intellij.openapi.vcs.update.CommonIntegrateProjectAction"/>
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index 9c33157063b8..b77a5823b58d 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -6,26 +6,6 @@ import javax.swing.*;
 
 public class AllIcons {
   
-  public static class _cvs {
-    public static final Icon CheckOut = IconLoader.getIcon("/_cvs/checkOut.png"); 
-    public static final Icon Cvs = IconLoader.getIcon("/_cvs/cvs.png"); 
-    public static final Icon HideMissing = IconLoader.getIcon("/_cvs/hideMissing.png"); 
-    public static final Icon HideUnknown = IconLoader.getIcon("/_cvs/hideUnknown.png"); 
-    public static final Icon HideUptodate = IconLoader.getIcon("/_cvs/hideUptodate.png"); 
-    public static final Icon Missing = IconLoader.getIcon("/_cvs/missing.png"); 
-    public static final Icon ShowAsTree = IconLoader.getIcon("/_cvs/showAsTree.png"); 
-    public static final Icon TestInProgress1 = IconLoader.getIcon("/_cvs/testInProgress1.png"); 
-    public static final Icon TestInProgress2 = IconLoader.getIcon("/_cvs/testInProgress2.png"); 
-    public static final Icon TestInProgress3 = IconLoader.getIcon("/_cvs/testInProgress3.png"); 
-    public static final Icon TestInProgress4 = IconLoader.getIcon("/_cvs/testInProgress4.png"); 
-    public static final Icon TestInProgress5 = IconLoader.getIcon("/_cvs/testInProgress5.png"); 
-    public static final Icon TestInProgress6 = IconLoader.getIcon("/_cvs/testInProgress6.png"); 
-    public static final Icon TestInProgress7 = IconLoader.getIcon("/_cvs/testInProgress7.png"); 
-    public static final Icon TestInProgress8 = IconLoader.getIcon("/_cvs/testInProgress8.png"); 
-    public static final Icon Unknown = IconLoader.getIcon("/_cvs/unknown.png"); 
-
-  }
-  
   public static class Actions {
     public static final Icon AddFacesSupport = IconLoader.getIcon("/actions/addFacesSupport.png"); 
     public static final Icon Annotate = IconLoader.getIcon("/actions/annotate.png"); 
@@ -155,6 +135,7 @@ public class AllIcons {
     public static final Icon Search = IconLoader.getIcon("/actions/search.png"); 
     public static final Icon Selectall = IconLoader.getIcon("/actions/selectall.png"); 
     public static final Icon Share = IconLoader.getIcon("/actions/share.png"); 
+    public static final Icon ShowAsTree = IconLoader.getIcon("/actions/showAsTree.png"); 
     public static final Icon ShowChangesOnly = IconLoader.getIcon("/actions/showChangesOnly.png"); 
     public static final Icon ShowHiddens = IconLoader.getIcon("/actions/showHiddens.png"); 
     public static final Icon ShowImportStatements = IconLoader.getIcon("/actions/showImportStatements.png"); 
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java
index 7eb880e46b1f..e5760a40ea9b 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java
@@ -108,7 +108,7 @@ public class CvsTabbedWindow {
     ToolWindowManager toolWindowManager = ToolWindowManager.getInstance(myProject);
     ToolWindow toolWindow =
       toolWindowManager.registerToolWindow(ToolWindowId.CVS, myContentManager.getComponent(), ToolWindowAnchor.BOTTOM);
-    toolWindow.setIcon(AllIcons._cvs.Cvs);
+    toolWindow.setIcon(AllIcons.Actions.Cvs);
     toolWindow.installWatcher(myContentManager);
   }