*** empty log message ***
diff --git a/platform/org.eclipse.platform/build.properties b/platform/org.eclipse.platform/build.properties
index e5bb69e..2e5a1bb 100644
--- a/platform/org.eclipse.platform/build.properties
+++ b/platform/org.eclipse.platform/build.properties
@@ -34,7 +34,8 @@
                macosx_narrow_book.css,\
                intro-eclipse.png,\
                introData.xml,\
-               helpData.xml
+               helpData.xml,\
+               images/
 src.includes = about.html,\
                launchersrc.zip,\
                platformsrc.zip
diff --git a/platform/org.eclipse.platform/intro/css/graphics/arrow.gif b/platform/org.eclipse.platform/images/topiclabel/arrow.gif
similarity index 100%
rename from platform/org.eclipse.platform/intro/css/graphics/arrow.gif
rename to platform/org.eclipse.platform/images/topiclabel/arrow.gif
Binary files differ
diff --git a/platform/org.eclipse.platform/images/topiclabel/ov_teamsup48.gif b/platform/org.eclipse.platform/images/topiclabel/ov_teamsup48.gif
new file mode 100644
index 0000000..ed93db0
--- /dev/null
+++ b/platform/org.eclipse.platform/images/topiclabel/ov_teamsup48.gif
Binary files differ
diff --git a/platform/org.eclipse.platform/images/topiclabel/ov_teamsup48_hov.gif b/platform/org.eclipse.platform/images/topiclabel/ov_teamsup48_hov.gif
new file mode 100644
index 0000000..464e9af
--- /dev/null
+++ b/platform/org.eclipse.platform/images/topiclabel/ov_teamsup48_hov.gif
Binary files differ
diff --git a/platform/org.eclipse.platform/images/topiclabel/ov_wbbasics48.gif b/platform/org.eclipse.platform/images/topiclabel/ov_wbbasics48.gif
new file mode 100644
index 0000000..d0102c9
--- /dev/null
+++ b/platform/org.eclipse.platform/images/topiclabel/ov_wbbasics48.gif
Binary files differ
diff --git a/platform/org.eclipse.platform/images/topiclabel/ov_wbbasics48_hov.gif b/platform/org.eclipse.platform/images/topiclabel/ov_wbbasics48_hov.gif
new file mode 100644
index 0000000..cc830b0
--- /dev/null
+++ b/platform/org.eclipse.platform/images/topiclabel/ov_wbbasics48_hov.gif
Binary files differ
diff --git a/platform/org.eclipse.platform/images/topiclabel/tu_checkout48.gif b/platform/org.eclipse.platform/images/topiclabel/tu_checkout48.gif
new file mode 100644
index 0000000..f3de4d2
--- /dev/null
+++ b/platform/org.eclipse.platform/images/topiclabel/tu_checkout48.gif
Binary files differ
diff --git a/platform/org.eclipse.platform/images/topiclabel/tu_checkout48_hov.gif b/platform/org.eclipse.platform/images/topiclabel/tu_checkout48_hov.gif
new file mode 100644
index 0000000..ffa86f9
--- /dev/null
+++ b/platform/org.eclipse.platform/images/topiclabel/tu_checkout48_hov.gif
Binary files differ
diff --git a/platform/org.eclipse.platform/images/topiclabel/tu_merge48.gif b/platform/org.eclipse.platform/images/topiclabel/tu_merge48.gif
new file mode 100644
index 0000000..ed93db0
--- /dev/null
+++ b/platform/org.eclipse.platform/images/topiclabel/tu_merge48.gif
Binary files differ
diff --git a/platform/org.eclipse.platform/images/topiclabel/tu_merge48_hov.gif b/platform/org.eclipse.platform/images/topiclabel/tu_merge48_hov.gif
new file mode 100644
index 0000000..464e9af
--- /dev/null
+++ b/platform/org.eclipse.platform/images/topiclabel/tu_merge48_hov.gif
Binary files differ
diff --git a/platform/org.eclipse.platform/images/topiclabel/wn_eclcommunity48.gif b/platform/org.eclipse.platform/images/topiclabel/wn_eclcommunity48.gif
new file mode 100644
index 0000000..075cfaa
--- /dev/null
+++ b/platform/org.eclipse.platform/images/topiclabel/wn_eclcommunity48.gif
Binary files differ
diff --git a/platform/org.eclipse.platform/images/topiclabel/wn_eclcommunity48_hov.gif b/platform/org.eclipse.platform/images/topiclabel/wn_eclcommunity48_hov.gif
new file mode 100644
index 0000000..7ec2cce
--- /dev/null
+++ b/platform/org.eclipse.platform/images/topiclabel/wn_eclcommunity48_hov.gif
Binary files differ
diff --git a/platform/org.eclipse.platform/images/topiclabel/wn_eclplatform48.gif b/platform/org.eclipse.platform/images/topiclabel/wn_eclplatform48.gif
new file mode 100644
index 0000000..f6fa59f
--- /dev/null
+++ b/platform/org.eclipse.platform/images/topiclabel/wn_eclplatform48.gif
Binary files differ
diff --git a/platform/org.eclipse.platform/images/topiclabel/wn_eclplatform48_hov.gif b/platform/org.eclipse.platform/images/topiclabel/wn_eclplatform48_hov.gif
new file mode 100644
index 0000000..8624fc1
--- /dev/null
+++ b/platform/org.eclipse.platform/images/topiclabel/wn_eclplatform48_hov.gif
Binary files differ
diff --git a/platform/org.eclipse.platform/images/topiclabel/wn_migrate48.gif b/platform/org.eclipse.platform/images/topiclabel/wn_migrate48.gif
new file mode 100644
index 0000000..f3de4d2
--- /dev/null
+++ b/platform/org.eclipse.platform/images/topiclabel/wn_migrate48.gif
Binary files differ
diff --git a/platform/org.eclipse.platform/images/topiclabel/wn_migrate48_hov.gif b/platform/org.eclipse.platform/images/topiclabel/wn_migrate48_hov.gif
new file mode 100644
index 0000000..ffa86f9
--- /dev/null
+++ b/platform/org.eclipse.platform/images/topiclabel/wn_migrate48_hov.gif
Binary files differ
diff --git a/platform/org.eclipse.platform/images/topiclabel/wn_updates48.gif b/platform/org.eclipse.platform/images/topiclabel/wn_updates48.gif
new file mode 100644
index 0000000..f2f80d8
--- /dev/null
+++ b/platform/org.eclipse.platform/images/topiclabel/wn_updates48.gif
Binary files differ
diff --git a/platform/org.eclipse.platform/images/topiclabel/wn_updates48_hov.gif b/platform/org.eclipse.platform/images/topiclabel/wn_updates48_hov.gif
new file mode 100644
index 0000000..08fbbed
--- /dev/null
+++ b/platform/org.eclipse.platform/images/topiclabel/wn_updates48_hov.gif
Binary files differ
diff --git a/platform/org.eclipse.platform/intro/css/graphics/obj48/community_obj.gif b/platform/org.eclipse.platform/intro/css/graphics/obj48/community_obj.gif
deleted file mode 100644
index 5d132a8..0000000
--- a/platform/org.eclipse.platform/intro/css/graphics/obj48/community_obj.gif
+++ /dev/null
Binary files differ
diff --git a/platform/org.eclipse.platform/intro/css/graphics/obj48/communityhov_obj.gif b/platform/org.eclipse.platform/intro/css/graphics/obj48/communityhov_obj.gif
deleted file mode 100644
index acb2a58..0000000
--- a/platform/org.eclipse.platform/intro/css/graphics/obj48/communityhov_obj.gif
+++ /dev/null
Binary files differ
diff --git a/platform/org.eclipse.platform/intro/css/graphics/obj48/migrate_obj.gif b/platform/org.eclipse.platform/intro/css/graphics/obj48/migrate_obj.gif
deleted file mode 100644
index 0c2fe88..0000000
--- a/platform/org.eclipse.platform/intro/css/graphics/obj48/migrate_obj.gif
+++ /dev/null
Binary files differ
diff --git a/platform/org.eclipse.platform/intro/css/graphics/obj48/migratehov_obj.gif b/platform/org.eclipse.platform/intro/css/graphics/obj48/migratehov_obj.gif
deleted file mode 100644
index ee34e2a..0000000
--- a/platform/org.eclipse.platform/intro/css/graphics/obj48/migratehov_obj.gif
+++ /dev/null
Binary files differ
diff --git a/platform/org.eclipse.platform/intro/css/graphics/obj48/teamsup_obj.gif b/platform/org.eclipse.platform/intro/css/graphics/obj48/teamsup_obj.gif
deleted file mode 100644
index 4b9def9..0000000
--- a/platform/org.eclipse.platform/intro/css/graphics/obj48/teamsup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/platform/org.eclipse.platform/intro/css/graphics/obj48/teamsuphov_obj.gif b/platform/org.eclipse.platform/intro/css/graphics/obj48/teamsuphov_obj.gif
deleted file mode 100644
index 4bdf819..0000000
--- a/platform/org.eclipse.platform/intro/css/graphics/obj48/teamsuphov_obj.gif
+++ /dev/null
Binary files differ
diff --git a/platform/org.eclipse.platform/intro/css/graphics/obj48/updates_obj.gif b/platform/org.eclipse.platform/intro/css/graphics/obj48/updates_obj.gif
deleted file mode 100644
index 1608b30..0000000
--- a/platform/org.eclipse.platform/intro/css/graphics/obj48/updates_obj.gif
+++ /dev/null
Binary files differ
diff --git a/platform/org.eclipse.platform/intro/css/graphics/obj48/updateshov_obj.gif b/platform/org.eclipse.platform/intro/css/graphics/obj48/updateshov_obj.gif
deleted file mode 100644
index 22a0ace..0000000
--- a/platform/org.eclipse.platform/intro/css/graphics/obj48/updateshov_obj.gif
+++ /dev/null
Binary files differ
diff --git a/platform/org.eclipse.platform/intro/css/graphics/obj48/wbbasics_obj.gif b/platform/org.eclipse.platform/intro/css/graphics/obj48/wbbasics_obj.gif
deleted file mode 100644
index 8b82563..0000000
--- a/platform/org.eclipse.platform/intro/css/graphics/obj48/wbbasics_obj.gif
+++ /dev/null
Binary files differ
diff --git a/platform/org.eclipse.platform/intro/css/graphics/obj48/wbbasicshov_obj.gif b/platform/org.eclipse.platform/intro/css/graphics/obj48/wbbasicshov_obj.gif
deleted file mode 100644
index 230be9c..0000000
--- a/platform/org.eclipse.platform/intro/css/graphics/obj48/wbbasicshov_obj.gif
+++ /dev/null
Binary files differ
diff --git a/platform/org.eclipse.platform/intro/css/overview.css b/platform/org.eclipse.platform/intro/css/overview.css
index 16ce29f..cc5d6ad 100644
--- a/platform/org.eclipse.platform/intro/css/overview.css
+++ b/platform/org.eclipse.platform/intro/css/overview.css
@@ -1,5 +1,5 @@
-a#basics img { background-image : url('graphics/obj48/wbbasics_obj.gif'); }
-a#basics:hover img { background-image : url('graphics/obj48/wbbasicshov_obj.gif'); }
+a#basics img { background-image : url('../../images/topiclabel/ov_wbbasics48.gif'); }
+a#basics:hover img { background-image : url('../../images/topiclabel/ov_wbbasics48_hov.gif'); }
 
-a#team img { background-image : url('graphics/obj48/teamsup_obj.gif'); }
-a#team:hover img { background-image : url('graphics/obj48/teamsuphov_obj.gif'); }
\ No newline at end of file
+a#team img { background-image : url('../../images/topiclabel/ov_teamsup48.gif'); }
+a#team:hover img { background-image : url('../../images/topiclabel/ov_teamsup48_hov.gif'); }
\ No newline at end of file
diff --git a/platform/org.eclipse.platform/intro/css/overview.properties b/platform/org.eclipse.platform/intro/css/overview.properties
index feecf8c..c7e33e7 100644
--- a/platform/org.eclipse.platform/intro/css/overview.properties
+++ b/platform/org.eclipse.platform/intro/css/overview.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
+# Copyright (c) 2005, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -10,11 +10,11 @@
 ###############################################################################
 overview.page-content.overview-links.layout.vspacing = 35
 
-overview.basics.link-icon = intro/css/graphics/obj48/wbbasics_obj.gif
-overview.basics.hover-icon = intro/css/graphics/obj48/wbbasicshov_obj.gif
+overview.basics.link-icon = images/topiclabel/ov_wbbasics48.gif
+overview.basics.hover-icon = images/topiclabel/ov_wbbasics48_hov.gif
 
-overview.team.link-icon = intro/css/graphics/obj48/teamsup_obj.gif
-overview.team.hover-icon = intro/css/graphics/obj48/teamsuphov_obj.gif
+overview.team.link-icon = images/topiclabel/ov_teamsup48.gif
+overview.team.hover-icon = images/topiclabel/ov_teamsup48_hov.gif
 
 overview.subtitle-id = overview/page-content/page-title
 overview.description-id = overview/page-content/page-description
\ No newline at end of file
diff --git a/platform/org.eclipse.platform/intro/css/tutorials.css b/platform/org.eclipse.platform/intro/css/tutorials.css
index a45ba1f..92770e2 100644
--- a/platform/org.eclipse.platform/intro/css/tutorials.css
+++ b/platform/org.eclipse.platform/intro/css/tutorials.css
@@ -1,5 +1,5 @@
-a#cvs_checkout img { background-image : url('graphics/obj48/migrate_obj.gif'); }
-a#cvs_checkout:hover img { background-image : url('graphics/obj48/migratehov_obj.gif'); }
+a#cvs_checkout img { background-image : url('../../images/topiclabel/tu_checkout48.gif'); }
+a#cvs_checkout:hover img { background-image : url('../../images/topiclabel/tu_checkout48_hov.gif'); }
 
-a#cvs_merge img { background-image : url('graphics/obj48/community_obj.gif'); }
-a#cvs_merge:hover img { background-image : url('graphics/obj48/communityhov_obj.gif'); }
+a#cvs_merge img { background-image : url('../../images/topiclabel/tu_merge48.gif'); }
+a#cvs_merge:hover img { background-image : url('../../images/topiclabel/tu_merge48_hov.gif'); }
diff --git a/platform/org.eclipse.platform/intro/css/tutorials.properties b/platform/org.eclipse.platform/intro/css/tutorials.properties
index dc1d9e0..8814fa2 100644
--- a/platform/org.eclipse.platform/intro/css/tutorials.properties
+++ b/platform/org.eclipse.platform/intro/css/tutorials.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# Copyright (c) 2006, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -9,11 +9,11 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-tutorials.cvs_checkout.link-icon = intro/css/graphics/obj48/migrate_obj.gif
-tutorials.cvs_checkout.hover-icon = intro/css/graphics/obj48/migratehov_obj.gif
+tutorials.cvs_checkout.link-icon = images/topiclabel/tu_checkout48.gif
+tutorials.cvs_checkout.hover-icon = images/topiclabel/tu_checkout48_hov.gif
 
-tutorials.cvs_merge.link-icon = intro/css/graphics/obj48/community_obj.gif
-tutorials.cvs_merge.hover-icon = intro/css/graphics/obj48/communityhov_obj.gif
+tutorials.cvs_merge.link-icon = images/topiclabel/tu_merge48.gif
+tutorials.cvs_merge.hover-icon = images/topiclabel/tu_merge48_hov.gif
 
 tutorials.subtitle-id = tutorials/page-content/page-title
 tutorials.description-id = tutorials/page-content/page-description
diff --git a/platform/org.eclipse.platform/intro/css/whatsnew.css b/platform/org.eclipse.platform/intro/css/whatsnew.css
index 99833c7..5515caa 100644
--- a/platform/org.eclipse.platform/intro/css/whatsnew.css
+++ b/platform/org.eclipse.platform/intro/css/whatsnew.css
@@ -1,11 +1,15 @@
-a#updates img { background-image : url(graphics/obj48/updates_obj.gif); }
-a#updates:hover img { background-image : url(graphics/obj48/updateshov_obj.gif); }
 
-a#eclipse img { background-image : url(graphics/obj48/community_obj.gif); }
-a#eclipse:hover img { background-image : url(graphics/obj48/communityhov_obj.gif); }
+a#platform-noteworthy img { background-image : url(../../images/topiclabel/wn_eclplatform48.gif); }
+a#platform-noteworthy:hover img { background-image : url(../../images/topiclabel/wn_eclplatform48_hov.gif); }
 
-a#migration img { background-image : url(graphics/obj48/migrate_obj.gif); }
-a#migration:hover img { background-image : url(graphics/obj48/migratehov_obj.gif); }
+a#updates img { background-image : url(../../images/topiclabel/wn_updates48.gif); }
+a#updates:hover img { background-image : url(../../images/topiclabel/wn_updates48_hov.gif); }
+
+a#eclipse img { background-image : url(../../images/topiclabel/wn_eclcommunity48.gif); }
+a#eclipse:hover img { background-image : url(../../images/topiclabel/wn_eclcommunity48_hov.gif); }
+
+a#migration img { background-image : url(../../images/topiclabel/wn_migrate48.gif); }
+a#migration:hover img { background-image : url(../../images/topiclabel/wn_migrate48_hov.gif); }
 
 div#rss-news {
 	position: relative;
@@ -29,7 +33,7 @@
 
 ul#eclipse-news {
 	list-style-type: none;
-	list-style-image: url("graphics/arrow.gif");
+	list-style-image: url("../../images/topiclabel/arrow.gif");
 	margin-left: 10px;
 	margin-top: 5px;
 }
diff --git a/platform/org.eclipse.platform/intro/css/whatsnew.properties b/platform/org.eclipse.platform/intro/css/whatsnew.properties
index ab2d253..34b0f1c 100644
--- a/platform/org.eclipse.platform/intro/css/whatsnew.properties
+++ b/platform/org.eclipse.platform/intro/css/whatsnew.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
+# Copyright (c) 2005, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -9,14 +9,17 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-whatsnew.updates.link-icon = intro/css/graphics/obj48/updates_obj.gif
-whatsnew.updates.hover-icon = intro/css/graphics/obj48/updateshov_obj.gif
+whatsnew.platform-noteworthy.link-icon = images/topiclabel/wn_eclplatform48.gif
+whatsnew.platform-noteworthy.hover-icon = images/topiclabel/wn_eclplatform48_hov.gif
 
-whatsnew.eclipse.link-icon = intro/css/graphics/obj48/community_obj.gif
-whatsnew.eclipse.hover-icon = intro/css/graphics/obj48/communityhov_obj.gif
+whatsnew.updates.link-icon = images/topiclabel/wn_updates48.gif
+whatsnew.updates.hover-icon = images/topiclabel/wn_updates48_hov.gif
 
-whatsnew.migration.link-icon = intro/css/graphics/obj48/migrate_obj.gif
-whatsnew.migration.hover-icon = intro/css/graphics/obj48/migratehov_obj.gif
+whatsnew.eclipse.link-icon = images/topiclabel/wn_eclcommunity48.gif
+whatsnew.eclipse.hover-icon = images/topiclabel/wn_eclcommunity48_hov.gif
+
+whatsnew.migration.link-icon = images/topiclabel/wn_migrate48.gif
+whatsnew.migration.hover-icon = images/topiclabel/wn_migrate48_hov.gif
 
 whatsnew.page-content.layout.vspacing = 40 
 
diff --git a/platform/org.eclipse.platform/intro/overviewEx.xml b/platform/org.eclipse.platform/intro/overviewExtensionContent.xml
similarity index 99%
rename from platform/org.eclipse.platform/intro/overviewEx.xml
rename to platform/org.eclipse.platform/intro/overviewExtensionContent.xml
index d3a1935..3f6bd32 100644
--- a/platform/org.eclipse.platform/intro/overviewEx.xml
+++ b/platform/org.eclipse.platform/intro/overviewExtensionContent.xml
@@ -10,4 +10,4 @@
        		</link>
        	</group>
   	</extensionContent>
-</introContent>
\ No newline at end of file
+</introContent>
diff --git a/platform/org.eclipse.platform/intro/tutorialsEx.xml b/platform/org.eclipse.platform/intro/tutorialsExtensionContent.xml
similarity index 100%
rename from platform/org.eclipse.platform/intro/tutorialsEx.xml
rename to platform/org.eclipse.platform/intro/tutorialsExtensionContent.xml
diff --git a/platform/org.eclipse.platform/intro/whatsnewEx1.xml b/platform/org.eclipse.platform/intro/whatsnewExtensionContent1.xml
similarity index 99%
rename from platform/org.eclipse.platform/intro/whatsnewEx1.xml
rename to platform/org.eclipse.platform/intro/whatsnewExtensionContent1.xml
index 895d389..c600269 100644
--- a/platform/org.eclipse.platform/intro/whatsnewEx1.xml
+++ b/platform/org.eclipse.platform/intro/whatsnewExtensionContent1.xml
@@ -7,4 +7,4 @@
        		</link>
        	</group>
   	</extensionContent>
-</introContent>
\ No newline at end of file
+</introContent>
diff --git a/platform/org.eclipse.platform/intro/whatsnewEx2.xml b/platform/org.eclipse.platform/intro/whatsnewExtensionContent2.xml
similarity index 99%
rename from platform/org.eclipse.platform/intro/whatsnewEx2.xml
rename to platform/org.eclipse.platform/intro/whatsnewExtensionContent2.xml
index 19ce14b..ad54e41 100644
--- a/platform/org.eclipse.platform/intro/whatsnewEx2.xml
+++ b/platform/org.eclipse.platform/intro/whatsnewExtensionContent2.xml
@@ -14,4 +14,4 @@
 			</group>
        </group>
   	</extensionContent>
-</introContent>
\ No newline at end of file
+</introContent>
diff --git a/platform/org.eclipse.platform/intro/whatsnewEx3.xml b/platform/org.eclipse.platform/intro/whatsnewExtensionContent3.xml
similarity index 100%
rename from platform/org.eclipse.platform/intro/whatsnewEx3.xml
rename to platform/org.eclipse.platform/intro/whatsnewExtensionContent3.xml
diff --git a/platform/org.eclipse.platform/plugin.xml b/platform/org.eclipse.platform/plugin.xml
index 80faf05..de0ec4d 100644
--- a/platform/org.eclipse.platform/plugin.xml
+++ b/platform/org.eclipse.platform/plugin.xml
@@ -82,19 +82,19 @@
             pluginId="org.eclipse.platform"/>
       <configExtension
             configId="org.eclipse.ui.intro.universalConfig"
-            content="$nl$/intro/overviewEx.xml"/>
+            content="$nl$/intro/overviewExtensionContent.xml"/>
       <configExtension
             configId="org.eclipse.ui.intro.universalConfig"
-            content="$nl$/intro/tutorialsEx.xml"/>
+            content="$nl$/intro/tutorialsExtensionContent.xml"/>
       <configExtension
             configId="org.eclipse.ui.intro.universalConfig"
-            content="$nl$/intro/whatsnewEx1.xml"/>
+            content="$nl$/intro/whatsnewExtensionContent1.xml"/>
       <configExtension
             configId="org.eclipse.ui.intro.universalConfig"
-            content="$nl$/intro/whatsnewEx2.xml"/>
+            content="$nl$/intro/whatsnewExtensionContent2.xml"/>
       <configExtension
             configId="org.eclipse.ui.intro.universalConfig"
-            content="$nl$/intro/whatsnewEx3.xml"/>
+            content="$nl$/intro/whatsnewExtensionContent3.xml"/>
    </extension>
 
    <extension