diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 3a4f97e6711..6678fa1f262 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-26 Mikhail Khodjaiants
+	Bug 105224: Two identical directory source container types.
+	* plugin.properties
+
 2005-07-26 Mikhail Khodjaiants
 	Bug 102929: Race conditions when setting breakpoints at launch.
 	The initial breakpoint settings, stop in main and resume are batched 
diff --git a/debug/org.eclipse.cdt.debug.core/plugin.properties b/debug/org.eclipse.cdt.debug.core/plugin.properties
index 1b1ca22e57c..20b9d5e4e4f 100644
--- a/debug/org.eclipse.cdt.debug.core/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.core/plugin.properties
@@ -22,5 +22,5 @@ containerName.mapping=Path Mapping
 containerDescription.mapping=A path mapping.
 containerName.mapEntry=Path Map Entry
 containerDescription.mapEntry=An entry in a path mapping.
-containerName.directory=Directory
-containerDescription.directory=A directory in the local file system
+containerName.directory=File System Directory With Subfolders
+containerDescription.directory=A directory in the local file system with the subfolders search option.
diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index 9996daf7acf..9161d04362b 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-26 Mikhail Khodjaiants
+	Bug 105224: Two identical directory source container types.
+	+ icons\obj16\directory_obj.gif
+	* plugin.xml
+
 2005-07-25 Alain Magloire
 	Part fix for PR 100992: The signature was incorrect for structure/unions.
 	
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/directory_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/directory_obj.gif
new file mode 100644
index 00000000000..7937f33e027
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/directory_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 661e9084d30..f097d86e4ab 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -1238,7 +1238,7 @@
       <sourceContainerPresentation
             browserClass="org.eclipse.cdt.debug.internal.ui.sourcelookup.CDirectorySourceContainerBrowser"
             containerTypeID="org.eclipse.cdt.debug.core.containerType.directory"
-            icon="icons/obj16/folder_obj.gif"
+            icon="icons/obj16/directory_obj.gif"
             id="org.eclipse.cdt.debug.ui.containerPresentation.directory"/>
    </extension>
    <extension