diff --git a/org.springframework.aop/src/main/resources/META-INF/spring.tooling b/org.springframework.aop/src/main/resources/META-INF/spring.tooling
new file mode 100644
index 00000000000..4c242e412fe
--- /dev/null
+++ b/org.springframework.aop/src/main/resources/META-INF/spring.tooling
@@ -0,0 +1,4 @@
+# Tooling related information for the aop namespace
+http\://www.springframework.org/schema/aop@name=aop Namespace
+http\://www.springframework.org/schema/aop@prefix=aop
+http\://www.springframework.org/schema/aop@icon=org/springframework/aop/config/spring-aop.gif
diff --git a/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop.gif b/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop.gif
new file mode 100644
index 00000000000..6663a51e602
Binary files /dev/null and b/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop.gif differ
diff --git a/org.springframework.beans/src/main/resources/META-INF/spring.tooling b/org.springframework.beans/src/main/resources/META-INF/spring.tooling
new file mode 100644
index 00000000000..12d6afadbb1
--- /dev/null
+++ b/org.springframework.beans/src/main/resources/META-INF/spring.tooling
@@ -0,0 +1,9 @@
+# Tooling related information for the beans namespace
+http\://www.springframework.org/schema/beans@name=beans Namespace
+http\://www.springframework.org/schema/beans@prefix=beans
+http\://www.springframework.org/schema/beans@icon=org/springframework/beans/factory/xml/spring-beans.gif
+
+# Tooling related information for the util namespace
+http\://www.springframework.org/schema/util@name=util Namespace
+http\://www.springframework.org/schema/util@prefix=util
+http\://www.springframework.org/schema/util@icon=org/springframework/beans/factory/xml/spring-util.gif
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.gif b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.gif
new file mode 100644
index 00000000000..e89df3c623f
Binary files /dev/null and b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.gif differ
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util.gif b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util.gif
new file mode 100644
index 00000000000..7b4486625d0
Binary files /dev/null and b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util.gif differ
diff --git a/org.springframework.context/src/main/resources/META-INF/spring.tooling b/org.springframework.context/src/main/resources/META-INF/spring.tooling
new file mode 100644
index 00000000000..f630c4e2390
--- /dev/null
+++ b/org.springframework.context/src/main/resources/META-INF/spring.tooling
@@ -0,0 +1,20 @@
+# Tooling related information for the context namespace
+http\://www.springframework.org/schema/context@name=context Namespace
+http\://www.springframework.org/schema/context@prefix=context
+http\://www.springframework.org/schema/context@icon=org/springframework/context/config/spring-context.gif
+
+# Tooling related information for the jee namespace
+http\://www.springframework.org/schema/jee@name=jee Namespace
+http\://www.springframework.org/schema/jee@prefix=jee
+http\://www.springframework.org/schema/jee@icon=org/springframework/ejb/config/spring-jee.gif
+
+# Tooling related information for the scheduling namespace
+http\://www.springframework.org/schema/task@name=task Namespace
+http\://www.springframework.org/schema/task@prefix=task
+http\://www.springframework.org/schema/task@icon=org/springframework/scheduling/config/spring-task.gif
+
+# Tooling related information for the lang namespace
+http\://www.springframework.org/schema/lang@name=lang Namespace
+http\://www.springframework.org/schema/lang@prefix=lang
+http\://www.springframework.org/schema/lang@icon=org/springframework/scripting/config/spring-lang.gif
+
diff --git a/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context.gif b/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context.gif
new file mode 100644
index 00000000000..371c0cd1b34
Binary files /dev/null and b/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context.gif differ
diff --git a/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee.gif b/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee.gif
new file mode 100644
index 00000000000..fbd89e27a54
Binary files /dev/null and b/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee.gif differ
diff --git a/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task.gif b/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task.gif
new file mode 100644
index 00000000000..da8b8f10929
Binary files /dev/null and b/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task.gif differ
diff --git a/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang.gif b/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang.gif
new file mode 100644
index 00000000000..d9929998ab9
Binary files /dev/null and b/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang.gif differ
diff --git a/org.springframework.jdbc/src/main/resources/META-INF/spring.tooling b/org.springframework.jdbc/src/main/resources/META-INF/spring.tooling
new file mode 100644
index 00000000000..bb4d4f285de
--- /dev/null
+++ b/org.springframework.jdbc/src/main/resources/META-INF/spring.tooling
@@ -0,0 +1,4 @@
+# Tooling related information for the jdbc namespace
+http\://www.springframework.org/schema/jdbc@name=jdbc Namespace
+http\://www.springframework.org/schema/jdbc@prefix=jdbc
+http\://www.springframework.org/schema/jdbc@icon=org/springframework/jdbc/config/spring-jdbc.gif
diff --git a/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc.gif b/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc.gif
new file mode 100644
index 00000000000..20ed1f9a443
Binary files /dev/null and b/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc.gif differ
diff --git a/org.springframework.jms/src/main/resources/META-INF/spring.tooling b/org.springframework.jms/src/main/resources/META-INF/spring.tooling
new file mode 100644
index 00000000000..1935cb1cd99
--- /dev/null
+++ b/org.springframework.jms/src/main/resources/META-INF/spring.tooling
@@ -0,0 +1,4 @@
+# Tooling related information for the jms namespace
+http\://www.springframework.org/schema/jms@name=jms Namespace
+http\://www.springframework.org/schema/jms@prefix=jms
+http\://www.springframework.org/schema/jms@icon=org/springframework/jms/config/spring-jms.gif
diff --git a/org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms.gif b/org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms.gif
new file mode 100644
index 00000000000..731b7a90959
Binary files /dev/null and b/org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms.gif differ
diff --git a/org.springframework.oxm/src/main/resources/META-INF/spring.schemas b/org.springframework.oxm/src/main/resources/META-INF/spring.schemas
index b3812d69f11..b6f1e6360bb 100644
--- a/org.springframework.oxm/src/main/resources/META-INF/spring.schemas
+++ b/org.springframework.oxm/src/main/resources/META-INF/spring.schemas
@@ -1 +1 @@
-http\://www.springframework.org/schema/oxm/spring-oxm-3.0.xsd=/org/springframework/oxm/config/spring-oxm-3.0.xsd
\ No newline at end of file
+http\://www.springframework.org/schema/oxm/spring-oxm-3.0.xsd=org/springframework/oxm/config/spring-oxm-3.0.xsd
\ No newline at end of file
diff --git a/org.springframework.oxm/src/main/resources/META-INF/spring.tooling b/org.springframework.oxm/src/main/resources/META-INF/spring.tooling
new file mode 100644
index 00000000000..aa9b1ca2a3c
--- /dev/null
+++ b/org.springframework.oxm/src/main/resources/META-INF/spring.tooling
@@ -0,0 +1,4 @@
+# Tooling related information for the oxm namespace
+http\://www.springframework.org/schema/oxm@name=oxm Namespace
+http\://www.springframework.org/schema/oxm@prefix=oxm
+http\://www.springframework.org/schema/oxm@icon=org/springframework/oxm/config/spring-oxm.gif
diff --git a/org.springframework.oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.gif b/org.springframework.oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.gif
new file mode 100644
index 00000000000..84d6307c9e4
Binary files /dev/null and b/org.springframework.oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.gif differ
diff --git a/org.springframework.transaction/src/main/resources/META-INF/spring.tooling b/org.springframework.transaction/src/main/resources/META-INF/spring.tooling
new file mode 100644
index 00000000000..8a83a4b6b12
--- /dev/null
+++ b/org.springframework.transaction/src/main/resources/META-INF/spring.tooling
@@ -0,0 +1,4 @@
+# Tooling related information for the tx namespace
+http\://www.springframework.org/schema/tx@name=tx Namespace
+http\://www.springframework.org/schema/tx@prefix=tx
+http\://www.springframework.org/schema/tx@icon=org/springframework/transaction/config/spring-tx.gif
diff --git a/org.springframework.transaction/src/main/resources/org/springframework/transaction/config/spring-tx.gif b/org.springframework.transaction/src/main/resources/org/springframework/transaction/config/spring-tx.gif
new file mode 100644
index 00000000000..20ed1f9a443
Binary files /dev/null and b/org.springframework.transaction/src/main/resources/org/springframework/transaction/config/spring-tx.gif differ