diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index 7b77308d..65f2c5e9 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -163,8 +163,12 @@
     		@link
     		@relativePath
     		@name
+    		@img
     	  -->
-    	<a href="${pathTool.calculateLink(link,relativePath)}">${name}</a>
+    	<a href="${pathTool.calculateLink(link,relativePath)}">
+    		<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>
     </define:tag>
     
     <define:tag name="text-xdoc">
diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index e1bea22c..4cd758ee 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -146,9 +146,9 @@
                 </j:if>
 
                 <x:if select="$nav">
-                  <jsl:applyTemplates select="$nav/body/menu"/>
+                  <jsl:applyTemplates select="$nav/body/menu[not(@type) | @type='header']"/>
                 </x:if>
-
+                
                 <!-- Standard Maven Navigation -->
                 <j:set var="fileName">${file}</j:set>
 
@@ -285,6 +285,7 @@
                   </j:if>
                 </div>
               </j:if>
+              
                 <j:if test="${date == 'navigation-bottom'}">
                   <div>
                     <small>Last published: ${build.date}</small>
@@ -358,14 +359,15 @@
     <x:set var="item" select="."/>
     <j:set var="_name"><x:expr select="@name"/></j:set>
     <j:set var="_link"><x:expr select="@href"/></j:set>
+    <j:set var="_img"><x:expr select="@img"/></j:set>
 
     <div>
       <small>
       	<j:if test="${navbean.isSelected(item.get(0))}">
-      		<b><doc:itemLink name="${_name}" link="${_link}"/></b>
+      		<b><doc:itemLink name="${_name}" link="${_link}" img="${_img}"/></b>
       	</j:if>
       	<j:if test="${!navbean.isSelected(item.get(0))}">
-      		<doc:itemLink name="${_name}" link="${_link}"/>
+      		<doc:itemLink name="${_name}" link="${_link}" img="${_img}"/>
       	</j:if>
       </small>
 	  <j:if test="${!navbean.isCollapsed(item.get(0))}">