diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index cc4502e2..5701e49b 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -176,8 +176,15 @@
         @relativePath
         @name
         @img
+        @state - expanded / collapsed / none
         -->
       <a href="${pathTool.calculateLink(link,relativePath)}">
+        <j:if test="${state == 'expanded'}">
+          <img class="handle" src="${relativePath}/images/expanded.png" alt="Expanded"/>
+        </j:if>
+        <j:if test="${state == 'collapsed'}">
+          <img class="handle" src="${relativePath}/images/collapsed.png" alt="Expandable"/>
+        </j:if>
         <j:if test="${empty(img)}">${name}</j:if>
         <j:if test="${!empty(img)}"><img style="border: 1px" src="${img}" title="${name}" alt="${name}"/></j:if>
        </a>
diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index 01237eef..350f40a0 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -386,14 +386,27 @@
     <x:set var="_name" select="string(@name)"/>
     <x:set var="_link" select="string(@href)"/>
     <x:set var="_img" select="string(@img)"/>
-
+	<x:set var="_childCount" select="count(./item)"/>
+	<j:set var="_isCollapsed" value="${navbean.isCollapsed(item.get(0))}"/>
+	<j:set var="_state" value="none"/>
+	
+	<j:if test="${_childCount.intValue() gt 0}">
+		<j:if test="${!_isCollapsed}">
+          <j:set var="_state" value="expanded"/>
+		</j:if>
+		<j:if test="${_isCollapsed}">
+          <j:set var="_state" value="collapsed"/>
+		</j:if>
+	</j:if>
+		   
+	
     <div>
       <small>
       	<j:if test="${navbean.isSelected(item.get(0))}">
-      		<b><doc:itemLink name="${_name}" link="${_link}" img="${_img}"/></b>
+      		<b><doc:itemLink name="${_name}" link="${_link}" img="${_img}" state="${_state}"/></b>
       	</j:if>
       	<j:if test="${!navbean.isSelected(item.get(0))}">
-      		<doc:itemLink name="${_name}" link="${_link}" img="${_img}"/>
+      		<doc:itemLink name="${_name}" link="${_link}" img="${_img}" state="${_state}"/>
       	</j:if>
       </small>
 	  <j:if test="${!navbean.isCollapsed(item.get(0))}">