diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
index e382e8be10d..5c65fc5a012 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
@@ -14,8 +14,6 @@
 
 <context id ="registers_preference_page_context">
    <description>Change the color in which register values are displayed. </description>
-   <topic href="cdt_u_reg_view_pref.htm"
-   	label="Registers view preferences"/>
 </context>
 
 <context id ="memory_view_context">
@@ -38,8 +36,6 @@
 
 <context id ="shared_libraries_preference_page_context">
    <description>Set the refresh preference for the Shared Libraries view. </description>
-   <topic href="cdt_u_shared_lib_view_pref.htm"
-   	label="Shared Libraries view preferences"/>
 </context>
 
 <context id ="signals_view_context">
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER_MI.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER_MI.xml
index d0fad30aaf7..060b6b85d3c 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER_MI.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER_MI.xml
@@ -8,8 +8,6 @@
 
 <context id ="cdt_u_gdb_mi_pref">
    <description>Enter a timeout value in milliseconds. </description>
-   <topic href="cdt_u_gdb_mi_pref.htm"
-   	label="GDB MI preference page"/>
 </context>
 
 </contexts>
diff --git a/doc/org.eclipse.cdt.doc.user/doc.zip b/doc/org.eclipse.cdt.doc.user/doc.zip
index 0690e7dcee0..4a0d9e20ca3 100644
Binary files a/doc/org.eclipse.cdt.doc.user/doc.zip and b/doc/org.eclipse.cdt.doc.user/doc.zip differ
diff --git a/doc/org.eclipse.cdt.doc.user/plugin.properties b/doc/org.eclipse.cdt.doc.user/plugin.properties
index 66740877105..6686638cdf0 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.properties
+++ b/doc/org.eclipse.cdt.doc.user/plugin.properties
@@ -7,14 +7,11 @@
    <csHelpTopic viewID="cdt_paths_symbols_page" helpTopic="cdt_u_newproj_pathsymb"/>
    <csHelpTopic viewID="man_proj_platform_help" helpTopic="cdt_u_newproj_platf"/>
    <csHelpTopic viewID="registers_view_context" helpTopic="cdt_u_registersview"/>
-   <csHelpTopic viewID="registers_preference_page_context" helpTopic="cdt_u_reg_view_pref"/>
    <csHelpTopic viewID="memory_view_context" helpTopic="cdt_u_memoryview"/>
    <csHelpTopic viewID="memory_preference_page_context" helpTopic="cdt_u_mem_view_pref"/>
    <csHelpTopic viewID="shared_libraries_view_context" helpTopic="cdt_u_shared_lib_view"/>
-   <csHelpTopic viewID="shared_libraries_preference_page_context" helpTopic="cdt_u_shared_lib_view_pref"/>
    <csHelpTopic viewID="signals_view_context" helpTopic="cdt_u_signals_view"/>
    <csHelpTopic viewID="c_debug_preference_page_context" helpTopic="cdt_u_dbg_pref"/>
-   <csHelpTopic viewID="mi_preference_page_context" helpTopic="cdt_u_gdb_mi_pref"/>
    <csHelpTopic viewID="launch_configuration_dialog_main_tab" helpTopic="cdt_u_run_dbg_main"/>
    <csHelpTopic viewID="launch_configuration_dialog_arguments_tab" helpTopic="cdt_u_run_dbg_arg"/>
    <csHelpTopic viewID="launch_configuration_dialog_environment_tab" helpTopic="cdt_u_run_dbg_env"/>
diff --git a/doc/org.eclipse.cdt.doc.user/toc.xml b/doc/org.eclipse.cdt.doc.user/toc.xml
index 4599ad11bb6..0b7bb2adebf 100644
--- a/doc/org.eclipse.cdt.doc.user/toc.xml
+++ b/doc/org.eclipse.cdt.doc.user/toc.xml
@@ -104,6 +104,7 @@
           </topic>
      </topic>
      <topic label="Reference" href="cdt_o_ref.htm">
+          <topic label="CDT icons" href="cdt_u_icons.htm"/>
           <topic label="Project properties" href="cdt_o_proj_prop_pages.htm">
                <topic label="Make Builder page, C/C++ Properties window" href="cdt_u_newproj_buildset.htm"/>
                <topic label="Error Parsers, C/C++ Properties window" href="cdt_u_newproj_parser_error.htm"/>
@@ -123,13 +124,13 @@
                     <topic label="Debug preferences" href="cdt_u_dbg_pref.htm"/>
                </topic>
           </topic>
-          <topic label="Run and Debug" href="cdt_o_run_dbg_pages.htm">
-               <topic label="Main page, Run/Debug dialog box" href="cdt_u_run_dbg_main.htm"/>
-               <topic label="Arguments page, Run/Debug dialog box" href="cdt_u_run_dbg_arg.htm"/>
-               <topic label="Environment page, Run/Debug dialog box" href="cdt_u_run_dbg_env.htm"/>
-               <topic label="Debugger page, Run/Debug dialog box" href="cdt_u_run_dbg_dbg.htm"/>
-               <topic label="Source page, Run/Debug dialog box" href="cdt_u_run_dbg_srce.htm"/>
-               <topic label="Common page, Run/Debug dialog box" href="cdt_u_run_dbg_comm.htm"/>
+          <topic label="Run and Debug dialog boxes" href="cdt_o_run_dbg_pages.htm">
+               <topic label="Main page, Run or Debug dialog box" href="cdt_u_run_dbg_main.htm"/>
+               <topic label="Arguments page, Run or Debug dialog box" href="cdt_u_run_dbg_arg.htm"/>
+               <topic label="Environment page, Run or Debug dialog box" href="cdt_u_run_dbg_env.htm"/>
+               <topic label="Debugger page, Run or Debug dialog box" href="cdt_u_run_dbg_dbg.htm"/>
+               <topic label="Source page, Run or Debug dialog box" href="cdt_u_run_dbg_srce.htm"/>
+               <topic label="Common page, Run or Debug dialog box" href="cdt_u_run_dbg_comm.htm"/>
           </topic>
           <topic label="C/C++ editor, code templates and search preferences" href="cdt_o_ceditor_pref.htm">
                <topic label="General page, Preferences window" href="cdt_u_c_editor_gen.htm"/>