diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index c8471eb8e91..9fa79076ce3 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,13 @@
+2005-02-15 Mikhail Khodjaiants
+	Bug 82264: Enhance the Shared Libraries view.
+	The "Load Symbols For All" action is added to the Modules view.
+	* plugin.xml
+	* plugin.properties
+	* icons/full/clcl16/load_all_symbols_co.gif
+	* icons/full/dlcl16/load_all_symbols_co.gif
+	* icons/full/elcl16/load_all_symbols_co.gif
+	* ICDebugUIInternalConstants.java: removed (cleanup)
+
 2005-02-15 Mikhail Khodjaiants
 	Bug 82264: Enhance the Shared Libraries view.
 	The Modules view's doesn't update labels when symbols are loaded.
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/load_all_symbols_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/load_all_symbols_co.gif
index b659df9d645..2109dd1fc29 100644
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/load_all_symbols_co.gif and b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/load_all_symbols_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/load_all_symbols_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/load_all_symbols_co.gif
index 0e062888d77..bb5fdbe45d6 100644
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/load_all_symbols_co.gif and b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/load_all_symbols_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/load_all_symbols_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/load_all_symbols_co.gif
index 22e5ab675a5..2109dd1fc29 100644
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/load_all_symbols_co.gif and b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/load_all_symbols_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.properties b/debug/org.eclipse.cdt.debug.ui/plugin.properties
index 99212f8e336..6ccfd7ae1c9 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.properties
@@ -71,9 +71,9 @@ AttachSourceEditor.name= Attach Source Editor
 CDebugEditor.name= C/C++ Debug Editor
 
 LoadSymbolsAction.label=Load Symbols
-LoadSymbolsAction.tooltip=Load Shared Library's Symbols
+LoadSymbolsAction.tooltip=Load Modules's Symbols
 LoadSymbolsForAllAction.label=Load Symbols For All
-LoadSymbolsForAllAction.tooltip=Load Symbols For All Shared Libraries
+LoadSymbolsForAllAction.tooltip=Load Symbols For All Modules
 
 SignalAction.label=Resume With Signal
 SignalAction.tooltip=Resume With Signal
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 2a702de3a50..8a9266b40dc 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -751,6 +751,25 @@
                id="org.eclipse.cdt.debug.ui.ModulePropertiesAction">
          </action>
       </objectContribution>
+      <viewerContribution
+            targetID="org.eclipse.cdt.debug.ui.ModulesView"
+            id="org.eclipse.cdt.debug.ui.modulesView.popupMenu">
+         <action
+               helpContextId="load_symbols_for_all_context"
+               label="%LoadSymbolsForAllAction.label"
+               tooltip="%LoadSymbolsForAllAction.tooltip"
+               icon="icons/full/elcl16/load_all_symbols_co.gif"
+               class="org.eclipse.cdt.debug.internal.ui.actions.LoadSymbolsForAllActionDelegate"
+               style="push"
+               menubarPath="modulesGroup"
+               id="org.eclipse.cdt.debug.ui.LoadSymbolsForAllAction">
+            <enablement>
+               <pluginState
+                     value="activated"
+                     id="org.eclipse.cdt.debug.ui"/>
+            </enablement>
+         </action>
+      </viewerContribution>
    </extension>
    <extension
          point="org.eclipse.ui.viewActions">
@@ -926,6 +945,23 @@
       <viewContribution
             targetID="org.eclipse.cdt.debug.ui.ModulesView"
             id="org.eclipse.debug.ui.modulesView.toolbar">
+         <action
+               helpContextId="load_symbols_for_all_context"
+               disabledIcon="icons/full/dlcl16/load_all_symbols_co.gif"
+               hoverIcon="icons/full/elcl16/load_all_symbols_co.gif"
+               toolbarPath="modulesGroup"
+               label="%LoadSymbolsForAllAction.label"
+               tooltip="%LoadSymbolsForAllAction.tooltip"
+               icon="icons/full/elcl16/load_all_symbols_co.gif"
+               class="org.eclipse.cdt.debug.internal.ui.actions.LoadSymbolsForAllActionDelegate"
+               style="push"
+               id="org.eclipse.cdt.debug.ui.LoadSymbolsForAllAction">
+            <enablement>
+               <pluginState
+                     value="activated"
+                     id="org.eclipse.cdt.debug.ui"/>
+            </enablement>
+         </action>
          <action
                helpContextId="collapse_all_modules_context"
                disabledIcon="icons/full/dlcl16/collapseall.gif"
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ICDebugUIInternalConstants.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ICDebugUIInternalConstants.java
deleted file mode 100644
index 82b3205f453..00000000000
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ICDebugUIInternalConstants.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     QNX Software Systems - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.cdt.debug.internal.ui;
-
-/**
- * 
- * Definitions of the internal constants for C/C++ Debug UI plug-in.
- * 
- * @since Jul 25, 2002
- */
-public interface ICDebugUIInternalConstants
-{
-	/*
-	 * Memory view constants.
-	 */
-	public static final int MEMORY_SIZE_BYTE = 1;
-	public static final int MEMORY_SIZE_HALF_WORD = 2;
-	public static final int MEMORY_SIZE_WORD = 4;
-	public static final int MEMORY_SIZE_DOUBLE_WORD = 8;
-	public static final int MEMORY_SIZE_FLOAT = 8;
-	public static final int MEMORY_SIZE_DOUBLE_FLOAT = 16;
-
-	public static final int MEMORY_FORMAT_HEX = 0;
-	public static final int MEMORY_FORMAT_BINARY = 1;
-	public static final int MEMORY_FORMAT_OCTAL = 2;
-	public static final int MEMORY_FORMAT_SIGNED_DECIMAL = 3;
-	public static final int MEMORY_FORMAT_UNSIGNED_DECIMAL = 4;
-
-	public static final int MEMORY_BYTES_PER_ROW_4 = 4;
-	public static final int MEMORY_BYTES_PER_ROW_8 = 8;
-	public static final int MEMORY_BYTES_PER_ROW_16 = 16;
-	public static final int MEMORY_BYTES_PER_ROW_32 = 32;
-	public static final int MEMORY_BYTES_PER_ROW_64 = 64;
-	public static final int MEMORY_BYTES_PER_ROW_128 = 128;
-
-	public static final int DEFAULT_MEMORY_NUMBER_OF_BYTES = 512;
-	public static final int DEFAULT_MEMORY_SIZE = MEMORY_SIZE_BYTE;
-	public static final int DEFAULT_MEMORY_FORMAT = MEMORY_FORMAT_HEX;
-	public static final int DEFAULT_MEMORY_BYTES_PER_ROW = MEMORY_BYTES_PER_ROW_16;
-	public static final boolean DEFAULT_MEMORY_DISPLAY_ASCII = true;
-}