diff --git a/plugins/ui-designer/src/META-INF/plugin.xml b/plugins/ui-designer/src/META-INF/plugin.xml
index 32bd49dc8c45..1871b77a7cb8 100644
--- a/plugins/ui-designer/src/META-INF/plugin.xml
+++ b/plugins/ui-designer/src/META-INF/plugin.xml
@@ -9,6 +9,10 @@
   <extensionPoints>
     <extensionPoint name="formInspectionTool"
                     interface="com.intellij.uiDesigner.inspections.FormInspectionTool"/>
+
+    <extensionPoint qualifiedName="com.intellij.paletteItemProvider"
+                    area="IDEA_PROJECT"
+                    interface="com.intellij.ide.palette.PaletteItemProvider"/>
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij.uiDesigner">
@@ -147,6 +151,9 @@
       <headless-implementation-class></headless-implementation-class>
       <skipForDefaultProject/>
     </component>
+    <component>
+      <implementation-class>com.intellij.ide.palette.impl.PaletteManager</implementation-class>
+    </component>
     <component>
       <implementation-class>com.intellij.uiDesigner.clientProperties.ClientPropertiesManager</implementation-class>
     </component>
diff --git a/java/openapi/src/com/intellij/ide/palette/PaletteDragEventListener.java b/plugins/ui-designer/src/com/intellij/ide/palette/PaletteDragEventListener.java
similarity index 100%
rename from java/openapi/src/com/intellij/ide/palette/PaletteDragEventListener.java
rename to plugins/ui-designer/src/com/intellij/ide/palette/PaletteDragEventListener.java
diff --git a/java/openapi/src/com/intellij/ide/palette/PaletteGroup.java b/plugins/ui-designer/src/com/intellij/ide/palette/PaletteGroup.java
similarity index 100%
rename from java/openapi/src/com/intellij/ide/palette/PaletteGroup.java
rename to plugins/ui-designer/src/com/intellij/ide/palette/PaletteGroup.java
diff --git a/java/openapi/src/com/intellij/ide/palette/PaletteItem.java b/plugins/ui-designer/src/com/intellij/ide/palette/PaletteItem.java
similarity index 100%
rename from java/openapi/src/com/intellij/ide/palette/PaletteItem.java
rename to plugins/ui-designer/src/com/intellij/ide/palette/PaletteItem.java
diff --git a/java/openapi/src/com/intellij/ide/palette/PaletteItemProvider.java b/plugins/ui-designer/src/com/intellij/ide/palette/PaletteItemProvider.java
similarity index 100%
rename from java/openapi/src/com/intellij/ide/palette/PaletteItemProvider.java
rename to plugins/ui-designer/src/com/intellij/ide/palette/PaletteItemProvider.java
diff --git a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteComponentList.java b/plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteComponentList.java
similarity index 100%
rename from java/idea-ui/src/com/intellij/ide/palette/impl/PaletteComponentList.java
rename to plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteComponentList.java
diff --git a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteContentWindow.java b/plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteContentWindow.java
similarity index 100%
rename from java/idea-ui/src/com/intellij/ide/palette/impl/PaletteContentWindow.java
rename to plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteContentWindow.java
diff --git a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java b/plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java
similarity index 100%
rename from java/idea-ui/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java
rename to plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java
diff --git a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteManager.java b/plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteManager.java
similarity index 100%
rename from java/idea-ui/src/com/intellij/ide/palette/impl/PaletteManager.java
rename to plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteManager.java
diff --git a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java b/plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteWindow.java
similarity index 100%
rename from java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java
rename to plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteWindow.java
diff --git a/resources/src/componentSets/IdeaComponents.xml b/resources/src/componentSets/IdeaComponents.xml
index 6faf2c022ed4..48a63411bc60 100644
--- a/resources/src/componentSets/IdeaComponents.xml
+++ b/resources/src/componentSets/IdeaComponents.xml
@@ -28,7 +28,6 @@
   <xi:include href="/componentSets/WindowManagement.xml" xpointer="xpointer(/components/*)"/>
   <xi:include href="/componentSets/Lang.xml" xpointer="xpointer(/components/*)"/>
   <xi:include href="/componentSets/ProjectView.xml" xpointer="xpointer(/components/*)"/>
-  <xi:include href="Toolwindows.xml" xpointer="xpointer(/components/*)"/>
   <xi:include href="/componentSets/Editor.xml" xpointer="xpointer(/components/*)"/>
   <xi:include href="Misc.xml" xpointer="xpointer(/components/*)"/>
   <xi:include href="Compiler.xml" xpointer="xpointer(/components/*)"/>
diff --git a/resources/src/componentSets/Toolwindows.xml b/resources/src/componentSets/Toolwindows.xml
deleted file mode 100644
index 4558cbfc6006..000000000000
--- a/resources/src/componentSets/Toolwindows.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<components>
-  <project-components>
-    <component>
-      <implementation-class>com.intellij.ide.palette.impl.PaletteManager</implementation-class>
-    </component>
-  </project-components>
-</components>
diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml
index 444336338b1a..485d07839866 100644
--- a/resources/src/idea/RichPlatformPlugin.xml
+++ b/resources/src/idea/RichPlatformPlugin.xml
@@ -76,9 +76,6 @@
     <extensionPoint name="compileServer.plugin" beanClass="com.intellij.compiler.server.CompileServerPlugin"/>
     <extensionPoint name="buildProcess.parametersProvider" area="IDEA_PROJECT" interface="com.intellij.compiler.server.BuildProcessParametersProvider"/>
 
-
-    <extensionPoint name="paletteItemProvider" area="IDEA_PROJECT" interface="com.intellij.ide.palette.PaletteItemProvider"/>
-
     <extensionPoint name="attachSourcesProvider" interface="com.intellij.codeInsight.AttachSourcesProvider"/>
 
     <extensionPoint name="java.compiler" area="IDEA_PROJECT"